diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index 7ba4478f3..1939e6b9b 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -1,6 +1,8 @@
#include "TextureViewer.h"
#include "ui_TextureViewer.h"
+#include "FlowLayout.h"
+
#include "Code/Core.h"
#if defined(__linux__)
@@ -21,8 +23,6 @@ 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 |
@@ -56,6 +56,26 @@ m_Core(core)
ui->dockarea->setRubberBandLineWidth(50);
ui->framerender->setWindowTitle(tr("OM RenderTarget 0 - GBuffer Colour"));
+
+ QVBoxLayout *vertical = new QVBoxLayout(this);
+
+ vertical->setSpacing(3);
+ vertical->setContentsMargins(0, 0, 0, 0);
+
+ FlowLayout *flow1 = new FlowLayout(this);
+ FlowLayout *flow2 = new FlowLayout(this);
+
+ flow1->addWidget(ui->channelsToolbar);
+ flow1->addWidget(ui->subresourceToolbar);
+ flow1->addWidget(ui->actionToolbar);
+
+ flow2->addWidget(ui->zoomToolbar);
+ flow2->addWidget(ui->overlayToolbar);
+ flow2->addWidget(ui->rangeToolbar);
+
+ vertical->addItem(flow1);
+ vertical->addItem(flow2);
+ vertical->addWidget(ui->dockarea);
}
TextureViewer::~TextureViewer()
diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui
index f73e7b4ff..d18126f20 100644
--- a/qrenderdoc/Windows/TextureViewer.ui
+++ b/qrenderdoc/Windows/TextureViewer.ui
@@ -6,7 +6,7 @@
0
0
- 1008
+ 591
571
@@ -19,714 +19,747 @@
QFrame::Raised
-
-
- 2
+
+
+
+ 70
+ 420
+ 119
+ 100
+
-
- 0
+
+
+ 100
+ 100
+
-
- 0
+
+
+
+
+ 310
+ 400
+ 129
+ 99
+
-
- 0
+
+ CrossCursor
-
- 0
+
+
- -
-
-
-
-
-
- QFrame::Panel
-
-
- QFrame::Raised
-
-
-
- 3
-
-
- 6
-
-
- 2
-
-
- 6
-
-
- 2
-
-
-
-
-
- Channels
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- -
-
-
- R
-
-
- true
-
-
- true
-
-
- true
-
-
-
- -
-
-
- G
-
-
- true
-
-
- true
-
-
- true
-
-
-
- -
-
-
- B
-
-
- true
-
-
- true
-
-
- QToolButton::DelayedPopup
-
-
- true
-
-
-
- -
-
-
- A
-
-
- true
-
-
- true
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- -
-
-
- Mul:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 50
- 0
-
-
-
-
- 50
- 16777215
-
-
-
- true
-
-
- 128
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 100
- 0
-
-
-
-
- -
-
-
-
-
-
-
- :/Resources/add.png:/Resources/add.png
-
-
- true
-
-
-
- -
-
-
-
-
-
-
- :/Resources/page_white_edit.png:/Resources/page_white_edit.png
-
-
- true
-
-
-
- -
-
-
-
-
-
-
- :/Resources/delete.png:/Resources/delete.png
-
-
- true
-
-
-
- -
-
-
-
-
-
-
- :/Resources/color_wheel.png:/Resources/color_wheel.png
-
-
- true
-
-
- true
-
-
-
- -
-
-
-
-
-
-
- :/Resources/crosshatch.png:/Resources/crosshatch.png
-
-
- true
-
-
- true
-
-
- true
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- -
-
-
-
- 23
- 22
-
-
-
- γ
-
-
- true
-
-
- true
-
-
- true
-
-
-
-
-
-
- -
-
-
- QFrame::Panel
-
-
- QFrame::Raised
-
-
-
- 3
-
-
- 6
-
-
- 2
-
-
- 6
-
-
- 2
-
-
-
-
-
- Subresource
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- -
-
-
- Mip
-
-
-
- -
-
-
- -
-
-
- Slice/Face
-
-
-
- -
-
-
-
-
-
- -
-
-
- QFrame::Panel
-
-
- QFrame::Raised
-
-
-
- 3
-
-
- 6
-
-
- 2
-
-
- 6
-
-
- 2
-
-
-
-
-
- Actions
-
-
-
- -
-
-
-
-
-
-
- :/Resources/save.png:/Resources/save.png
-
-
- true
-
-
-
- -
-
-
-
-
-
-
- :/Resources/page_white_link.png:/Resources/page_white_link.png
-
-
- true
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- QFrame::Panel
-
-
- QFrame::Raised
-
-
-
- 3
-
-
- 6
-
-
- 2
-
-
- 6
-
-
- 2
-
-
-
-
-
- Zoom
-
-
-
- -
-
-
- Fit
-
-
-
- :/Resources/fit_window.png:/Resources/fit_window.png
-
-
- true
-
-
- true
-
-
- Qt::ToolButtonTextBesideIcon
-
-
- true
-
-
-
- -
-
-
- -
-
-
-
-
-
-
- :/Resources/flip_y.png:/Resources/flip_y.png
-
-
- true
-
-
- true
-
-
-
-
-
-
- -
-
-
- QFrame::Panel
-
-
- QFrame::Raised
-
-
-
- 3
-
-
- 6
-
-
- 2
-
-
- 6
-
-
- 2
-
-
-
-
-
- Overlay
-
-
-
- -
-
-
-
-
-
- -
-
-
- QFrame::Panel
-
-
- QFrame::Raised
-
-
-
- 3
-
-
- 6
-
-
- 2
-
-
- 6
-
-
- 2
-
-
-
-
-
- Range
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 50
- 16777215
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 50
- 16777215
-
-
-
-
- -
-
-
-
-
-
-
- :/Resources/zoom.png:/Resources/zoom.png
-
-
- true
-
-
-
- -
-
-
-
-
-
-
- :/Resources/wand.png:/Resources/wand.png
-
-
- true
-
-
-
- -
-
-
- ...
-
-
-
- :/Resources/arrow_undo.png:/Resources/arrow_undo.png
-
-
- true
-
-
-
- -
-
-
- ...
-
-
-
- :/Resources/chart_curve.png:/Resources/chart_curve.png
-
-
- true
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
- 100
- 100
-
-
-
-
- -
-
-
- CrossCursor
-
-
- CustomPaintWidget{border:1px black solid;}
-
-
-
-
+
+
+
+
+ 20
+ 190
+ 255
+ 28
+
+
+
+
+ 0
+ 28
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
+ 3
+
+
+ 6
+
+
+ 2
+
+
+ 6
+
+
+ 2
+
+ -
+
+
+ Range
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 50
+ 16777215
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 50
+ 16777215
+
+
+
+
+ -
+
+
+
+
+
+
+ :/Resources/zoom.png:/Resources/zoom.png
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/Resources/wand.png:/Resources/wand.png
+
+
+ true
+
+
+
+ -
+
+
+ ...
+
+
+
+ :/Resources/arrow_undo.png:/Resources/arrow_undo.png
+
+
+ true
+
+
+
+ -
+
+
+ ...
+
+
+
+ :/Resources/chart_curve.png:/Resources/chart_curve.png
+
+
+ true
+
+
+
+
+
+
+
+
+ 200
+ 145
+ 129
+ 28
+
+
+
+
+ 0
+ 28
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
+ 3
+
+
+ 6
+
+
+ 2
+
+
+ 6
+
+
+ 2
+
+ -
+
+
+ Overlay
+
+
+
+ -
+
+
+
+
+
+
+
+ 3
+ 145
+ 191
+ 28
+
+
+
+
+ 0
+ 28
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
+ 3
+
+
+ 6
+
+
+ 2
+
+
+ 6
+
+
+ 2
+
+ -
+
+
+ Zoom
+
+
+
+ -
+
+
+ Fit
+
+
+
+ :/Resources/fit_window.png:/Resources/fit_window.png
+
+
+ true
+
+
+ true
+
+
+ Qt::ToolButtonTextBesideIcon
+
+
+ true
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+
+ :/Resources/flip_y.png:/Resources/flip_y.png
+
+
+ true
+
+
+ true
+
+
+
+
+
+
+
+
+ 340
+ 40
+ 101
+ 28
+
+
+
+
+ 0
+ 28
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
+ 3
+
+
+ 6
+
+
+ 2
+
+
+ 6
+
+
+ 2
+
+ -
+
+
+ Actions
+
+
+
+ -
+
+
+
+
+
+
+ :/Resources/save.png:/Resources/save.png
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/Resources/page_white_link.png:/Resources/page_white_link.png
+
+
+ true
+
+
+
+
+
+
+
+
+ 10
+ 40
+ 304
+ 28
+
+
+
+
+ 0
+ 28
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
+ 3
+
+
+ 6
+
+
+ 2
+
+
+ 6
+
+
+ 2
+
+ -
+
+
+ Subresource
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
+ Mip
+
+
+
+ -
+
+
+ -
+
+
+ Slice/Face
+
+
+
+ -
+
+
+
+
+
+
+
+ 3
+ 3
+ 579
+ 28
+
+
+
+
+ 0
+ 28
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
+ 3
+
+
+ 6
+
+
+ 2
+
+
+ 6
+
+
+ 2
+
+ -
+
+
+ Channels
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
+ R
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+ -
+
+
+ G
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+ -
+
+
+ B
+
+
+ true
+
+
+ true
+
+
+ QToolButton::DelayedPopup
+
+
+ true
+
+
+
+ -
+
+
+ A
+
+
+ true
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
+ Mul:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 50
+ 0
+
+
+
+
+ 50
+ 16777215
+
+
+
+ true
+
+
+ 128
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 100
+ 0
+
+
+
+
+ -
+
+
+
+
+
+
+ :/Resources/add.png:/Resources/add.png
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/Resources/page_white_edit.png:/Resources/page_white_edit.png
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/Resources/delete.png:/Resources/delete.png
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/Resources/color_wheel.png:/Resources/color_wheel.png
+
+
+ true
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ :/Resources/crosshatch.png:/Resources/crosshatch.png
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
+
+ 23
+ 22
+
+
+
+ γ
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+
+