diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index dfce66858..7ba4478f3 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -20,6 +20,42 @@ m_Core(core)
ui->framerender->SetOutput(NULL);
m_Output = NULL;
+
+ ui->verticalLayout->removeWidget(ui->framerender);
+
+ ui->dockarea->addToolWindow(ui->framerender, ToolWindowManager::EmptySpace);
+ ui->dockarea->setToolWindowProperties(ui->framerender, ToolWindowManager::DisallowUserDocking |
+ ToolWindowManager::HideCloseButton |
+ ToolWindowManager::DisableDraggableTab);
+
+ QWidget *lockedTabTest = new QWidget(this);
+ lockedTabTest->setWindowTitle(tr("Locked Tab #1"));
+
+ ui->dockarea->addToolWindow(lockedTabTest, ToolWindowManager::AreaReference(ToolWindowManager::AddTo, ui->dockarea->areaOf(ui->framerender)));
+ ui->dockarea->setToolWindowProperties(lockedTabTest, ToolWindowManager::DisallowUserDocking | ToolWindowManager::HideCloseButton);
+
+ lockedTabTest = new QWidget(this);
+ lockedTabTest->setWindowTitle(tr("Locked Tab #2"));
+
+ ui->dockarea->addToolWindow(lockedTabTest, ToolWindowManager::AreaReference(ToolWindowManager::AddTo, ui->dockarea->areaOf(ui->framerender)));
+ ui->dockarea->setToolWindowProperties(lockedTabTest, ToolWindowManager::DisallowUserDocking | ToolWindowManager::HideCloseButton);
+
+ lockedTabTest = new QWidget(this);
+ lockedTabTest->setWindowTitle(tr("Locked Tab #3"));
+
+ ui->dockarea->addToolWindow(lockedTabTest, ToolWindowManager::AreaReference(ToolWindowManager::AddTo, ui->dockarea->areaOf(ui->framerender)));
+ ui->dockarea->setToolWindowProperties(lockedTabTest, ToolWindowManager::DisallowUserDocking | ToolWindowManager::HideCloseButton);
+
+ lockedTabTest = new QWidget(this);
+ lockedTabTest->setWindowTitle(tr("Locked Tab #4"));
+
+ ui->dockarea->addToolWindow(lockedTabTest, ToolWindowManager::AreaReference(ToolWindowManager::AddTo, ui->dockarea->areaOf(ui->framerender)));
+ ui->dockarea->setToolWindowProperties(lockedTabTest, ToolWindowManager::DisallowUserDocking | ToolWindowManager::HideCloseButton);
+
+ ui->dockarea->setAllowFloatingWindow(false);
+ ui->dockarea->setRubberBandLineWidth(50);
+
+ ui->framerender->setWindowTitle(tr("OM RenderTarget 0 - GBuffer Colour"));
}
TextureViewer::~TextureViewer()
diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui
index bdfb6fff2..b819074c2 100644
--- a/qrenderdoc/Windows/TextureViewer.ui
+++ b/qrenderdoc/Windows/TextureViewer.ui
@@ -6,8 +6,8 @@
0
0
- 513
- 494
+ 457
+ 446
@@ -19,17 +19,206 @@
QFrame::Raised
-
- -
-
-
- Placeholder for Texture Viewer
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
-
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
-
+
+
+ Channels
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+
+ -
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
-
+
+
+ Subresource
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
-
+
+
+ Actions
+
+
+
+ -
+
+
+ ...
+
+
+
+ -
+
+
+ ...
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
-
+
+
+ Zoom
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
-
+
+
+ Overlay
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
-
+
+
+ Range
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ ...
+
+
+
+
+
+
+
+
+ -
+
+
+
+ 100
+ 100
+
+
+
+
+ -
+
+
+ CrossCursor
+
+
+ CustomPaintWidget{border:1px black solid;}
-
-
-
-
-
-
@@ -40,6 +229,11 @@
QWidget
Widgets/CustomPaintWidget.h
+
+ ToolWindowManager
+ QWidget
+
+