Skip to content

Commit d57cc1b

Browse files
baldurkbaldurk
committed
Add more consistency to docking panels and widgets
* Dock panels shouldn't have any frame border or anything like that. * They should have an external margin of 3 pixels at their border, but then no further margins on the layouts (like sub-controls for the pipeline state views. * Toolbars should be Raised & Panel frames. Later we'll replace them with actual QToolBars to better customise the painting.
1 parent 541aa23 commit d57cc1b

19 files changed

+263
-270
lines changed

‎qrenderdoc/Windows/APIInspector.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
<number>0</number>
1919
</property>
2020
<property name="leftMargin">
21-
<number>0</number>
21+
<number>3</number>
2222
</property>
2323
<property name="topMargin">
24-
<number>0</number>
24+
<number>3</number>
2525
</property>
2626
<property name="rightMargin">
27-
<number>0</number>
27+
<number>3</number>
2828
</property>
2929
<property name="bottomMargin">
30-
<number>0</number>
30+
<number>3</number>
3131
</property>
3232
<item>
3333
<widget class="RDSplitter" name="splitter">

‎qrenderdoc/Windows/BufferViewer.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,6 +1098,7 @@ void BufferViewer::SetupRawView()
10981098
ui->instance->setVisible(false);
10991099

11001100
ui->vsinData->setWindowTitle(tr("Buffer Contents"));
1101+
ui->vsinData->setFrameShape(QFrame::NoFrame);
11011102
ui->dockarea->addToolWindow(ui->vsinData, ToolWindowManager::EmptySpace);
11021103
ui->dockarea->setToolWindowProperties(ui->vsinData, ToolWindowManager::HideCloseButton);
11031104

@@ -1116,7 +1117,7 @@ void BufferViewer::SetupRawView()
11161117
QVBoxLayout *vertical = new QVBoxLayout(this);
11171118

11181119
vertical->setSpacing(3);
1119-
vertical->setContentsMargins(0, 0, 0, 0);
1120+
vertical->setContentsMargins(3, 3, 3, 3);
11201121

11211122
vertical->addWidget(ui->meshToolbar);
11221123
vertical->addWidget(ui->dockarea);
@@ -1141,18 +1142,21 @@ void BufferViewer::SetupMeshView()
11411142
ui->dockarea->setToolWindowProperties(ui->outputTabs, ToolWindowManager::HideCloseButton);
11421143

11431144
ui->vsinData->setWindowTitle(tr("VS Input"));
1145+
ui->vsinData->setFrameShape(QFrame::NoFrame);
11441146
ui->dockarea->addToolWindow(
11451147
ui->vsinData, ToolWindowManager::AreaReference(ToolWindowManager::TopOf,
11461148
ui->dockarea->areaOf(ui->outputTabs), 0.5f));
11471149
ui->dockarea->setToolWindowProperties(ui->vsinData, ToolWindowManager::HideCloseButton);
11481150

11491151
ui->vsoutData->setWindowTitle(tr("VS Output"));
1152+
ui->vsoutData->setFrameShape(QFrame::NoFrame);
11501153
ui->dockarea->addToolWindow(
11511154
ui->vsoutData, ToolWindowManager::AreaReference(ToolWindowManager::RightOf,
11521155
ui->dockarea->areaOf(ui->vsinData), 0.5f));
11531156
ui->dockarea->setToolWindowProperties(ui->vsoutData, ToolWindowManager::HideCloseButton);
11541157

11551158
ui->gsoutData->setWindowTitle(tr("GS/DS Output"));
1159+
ui->gsoutData->setFrameShape(QFrame::NoFrame);
11561160
ui->dockarea->addToolWindow(
11571161
ui->gsoutData, ToolWindowManager::AreaReference(ToolWindowManager::AddTo,
11581162
ui->dockarea->areaOf(ui->vsoutData), 0.5f));
@@ -1225,7 +1229,7 @@ void BufferViewer::SetupMeshView()
12251229
QVBoxLayout *vertical = new QVBoxLayout(this);
12261230

12271231
vertical->setSpacing(3);
1228-
vertical->setContentsMargins(0, 0, 0, 0);
1232+
vertical->setContentsMargins(3, 3, 3, 3);
12291233

12301234
vertical->addWidget(ui->meshToolbar);
12311235
vertical->addWidget(ui->dockarea);

‎qrenderdoc/Windows/BufferViewer.ui

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@
9999
<property name="currentIndex">
100100
<number>0</number>
101101
</property>
102+
<property name="documentMode">
103+
<bool>true</bool>
104+
</property>
102105
<widget class="QWidget" name="vsinTab">
103106
<attribute name="title">
104107
<string>VS In</string>

‎qrenderdoc/Windows/ConstantBufferPreviewer.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
<number>0</number>
1919
</property>
2020
<property name="leftMargin">
21-
<number>0</number>
21+
<number>3</number>
2222
</property>
2323
<property name="topMargin">
24-
<number>0</number>
24+
<number>3</number>
2525
</property>
2626
<property name="rightMargin">
27-
<number>0</number>
27+
<number>3</number>
2828
</property>
2929
<property name="bottomMargin">
30-
<number>0</number>
30+
<number>3</number>
3131
</property>
3232
<item>
3333
<widget class="QSplitter" name="splitter">

‎qrenderdoc/Windows/DebugMessageView.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
</property>
1313
<layout class="QVBoxLayout" name="verticalLayout">
1414
<property name="leftMargin">
15-
<number>2</number>
15+
<number>3</number>
1616
</property>
1717
<property name="topMargin">
18-
<number>2</number>
18+
<number>3</number>
1919
</property>
2020
<property name="rightMargin">
21-
<number>2</number>
21+
<number>3</number>
2222
</property>
2323
<property name="bottomMargin">
24-
<number>2</number>
24+
<number>3</number>
2525
</property>
2626
<item>
2727
<widget class="QTableView" name="messages">

‎qrenderdoc/Windows/Dialogs/CaptureDialog.ui

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>578</width>
10-
<height>943</height>
10+
<height>1025</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -18,16 +18,16 @@
1818
<number>4</number>
1919
</property>
2020
<property name="leftMargin">
21-
<number>6</number>
21+
<number>3</number>
2222
</property>
2323
<property name="topMargin">
24-
<number>6</number>
24+
<number>3</number>
2525
</property>
2626
<property name="rightMargin">
27-
<number>6</number>
27+
<number>3</number>
2828
</property>
2929
<property name="bottomMargin">
30-
<number>6</number>
30+
<number>3</number>
3131
</property>
3232
<item>
3333
<widget class="QGroupBox" name="exeGroup">
@@ -787,8 +787,6 @@
787787
<header>Widgets/Extended/RDLabel.h</header>
788788
</customwidget>
789789
</customwidgets>
790-
<resources>
791-
<include location="../../Resources/resources.qrc"/>
792-
</resources>
790+
<resources/>
793791
<connections/>
794792
</ui>

‎qrenderdoc/Windows/Dialogs/LiveCapture.ui

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
</property>
1616
<layout class="QVBoxLayout" name="mainLayout">
1717
<property name="leftMargin">
18-
<number>2</number>
18+
<number>3</number>
1919
</property>
2020
<property name="topMargin">
21-
<number>2</number>
21+
<number>3</number>
2222
</property>
2323
<property name="rightMargin">
24-
<number>2</number>
24+
<number>3</number>
2525
</property>
2626
<property name="bottomMargin">
27-
<number>2</number>
27+
<number>3</number>
2828
</property>
2929
<item>
3030
<widget class="QFrame" name="connectionFrame">
@@ -401,16 +401,16 @@
401401
</layout>
402402
</widget>
403403
<customwidgets>
404-
<customwidget>
405-
<class>RDListWidget</class>
406-
<extends>QListWidget</extends>
407-
<header>Widgets/Extended/RDListWidget.h</header>
408-
</customwidget>
409404
<customwidget>
410405
<class>RDLabel</class>
411406
<extends>QLabel</extends>
412407
<header>Widgets/Extended/RDLabel.h</header>
413408
</customwidget>
409+
<customwidget>
410+
<class>RDListWidget</class>
411+
<extends>QListWidget</extends>
412+
<header>Widgets/Extended/RDListWidget.h</header>
413+
</customwidget>
414414
</customwidgets>
415415
<resources>
416416
<include location="../../Resources/resources.qrc"/>

‎qrenderdoc/Windows/EventBrowser.ui

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,28 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>275</width>
9+
<width>279</width>
1010
<height>298</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Event Browser</string>
1515
</property>
16-
<property name="frameShape">
17-
<enum>QFrame::StyledPanel</enum>
18-
</property>
19-
<property name="frameShadow">
20-
<enum>QFrame::Raised</enum>
21-
</property>
2216
<layout class="QVBoxLayout" name="verticalLayout">
2317
<property name="spacing">
2418
<number>0</number>
2519
</property>
2620
<property name="leftMargin">
27-
<number>0</number>
21+
<number>3</number>
2822
</property>
2923
<property name="topMargin">
30-
<number>0</number>
24+
<number>3</number>
3125
</property>
3226
<property name="rightMargin">
33-
<number>0</number>
27+
<number>3</number>
3428
</property>
3529
<property name="bottomMargin">
36-
<number>0</number>
30+
<number>3</number>
3731
</property>
3832
<item>
3933
<layout class="QHBoxLayout" name="horizontalLayout">

0 commit comments

Comments
 (0)