From f930154be7289997defaaf1ba3faf9532d538aa1 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 3 Oct 2016 17:49:03 +0200 Subject: [PATCH] Rename thumb lists to input/output --- qrenderdoc/Windows/TextureViewer.cpp | 21 ++++++++------- qrenderdoc/Windows/TextureViewer.ui | 39 ++++++++++++++++++++++------ 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp index e9c6ab6c2..3289be34e 100644 --- a/qrenderdoc/Windows/TextureViewer.cpp +++ b/qrenderdoc/Windows/TextureViewer.cpp @@ -2,6 +2,7 @@ #include "TextureViewer.h" #include #include "Code/Core.h" +#include "Widgets/ResourcePreview.h" #include "FlowLayout.h" #include "ui_TextureViewer.h" @@ -104,21 +105,21 @@ TextureViewer::TextureViewer(Core *core, QWidget *parent) ui->dockarea->setToolWindowProperties(lockedTabTest, ToolWindowManager::DisallowUserDocking | ToolWindowManager::HideCloseButton);*/ - ui->dockarea->addToolWindow(ui->resourceThumbs, ToolWindowManager::AreaReference( - ToolWindowManager::RightOf, - ui->dockarea->areaOf(renderContainer), 0.25f)); - ui->dockarea->setToolWindowProperties(ui->resourceThumbs, ToolWindowManager::HideCloseButton); + ui->dockarea->addToolWindow(ui->inputThumbs, ToolWindowManager::AreaReference( + ToolWindowManager::RightOf, + ui->dockarea->areaOf(renderContainer), 0.25f)); + ui->dockarea->setToolWindowProperties(ui->inputThumbs, ToolWindowManager::HideCloseButton); ui->dockarea->addToolWindow( - ui->targetThumbs, ToolWindowManager::AreaReference(ToolWindowManager::AddTo, - ui->dockarea->areaOf(ui->resourceThumbs))); - ui->dockarea->setToolWindowProperties(ui->targetThumbs, ToolWindowManager::HideCloseButton); + ui->outputThumbs, ToolWindowManager::AreaReference(ToolWindowManager::AddTo, + ui->dockarea->areaOf(ui->inputThumbs))); + ui->dockarea->setToolWindowProperties(ui->outputThumbs, ToolWindowManager::HideCloseButton); // need to add a way to make this less than 50% programmatically ui->dockarea->addToolWindow( ui->pixelContextLayout, ToolWindowManager::AreaReference(ToolWindowManager::BottomOf, - ui->dockarea->areaOf(ui->targetThumbs), 0.25f)); + ui->dockarea->areaOf(ui->outputThumbs), 0.25f)); ui->dockarea->setToolWindowProperties(ui->pixelContextLayout, ToolWindowManager::HideCloseButton); ui->dockarea->setAllowFloatingWindow(false); @@ -126,8 +127,8 @@ TextureViewer::TextureViewer(Core *core, QWidget *parent) renderContainer->setWindowTitle(tr("Unbound")); ui->pixelContextLayout->setWindowTitle(tr("Pixel Context")); - ui->targetThumbs->setWindowTitle(tr("OM Targets")); - ui->resourceThumbs->setWindowTitle(tr("PS Resources")); + ui->outputThumbs->setWindowTitle(tr("Outputs")); + ui->inputThumbs->setWindowTitle(tr("Inputs")); QVBoxLayout *vertical = new QVBoxLayout(this); diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui index 85e05d261..3471ec80f 100644 --- a/qrenderdoc/Windows/TextureViewer.ui +++ b/qrenderdoc/Windows/TextureViewer.ui @@ -1066,13 +1066,13 @@ - + 430 460 - 120 - 80 + 121 + 81 @@ -1081,21 +1081,41 @@ QFrame::Plain + + Qt::ScrollBarAlwaysOff + true - + 0 0 - 118 - 78 + 119 + 79 + + + 10 + + + 5 + + + 5 + + + 5 + + + 5 + + - + 290 @@ -1110,10 +1130,13 @@ QFrame::Plain + + Qt::ScrollBarAlwaysOff + true - + 0