From 2f02f2159eaf113ea99b5b08130988497bdbec19 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 10 Nov 2017 16:47:54 +0000
Subject: [PATCH] Fix some margins/spacings to be more consistent across the UI

---
 .../PipelineState/D3D11PipelineStateViewer.ui | 40 +++++++++----------
 .../PipelineState/D3D12PipelineStateViewer.ui | 38 +++++++++---------
 .../PipelineState/GLPipelineStateViewer.ui    | 38 +++++++++---------
 .../VulkanPipelineStateViewer.ui              | 40 +++++++++----------
 qrenderdoc/Windows/ShaderViewer.cpp           |  4 +-
 5 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
index 773b7c37c..4466b186e 100644
--- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
@@ -36,19 +36,19 @@
      </property>
      <layout class="QHBoxLayout" name="toolbarLayout">
       <property name="spacing">
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="leftMargin">
-       <number>0</number>
+       <number>6</number>
       </property>
       <property name="topMargin">
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>6</number>
       </property>
       <property name="bottomMargin">
-       <number>0</number>
+       <number>2</number>
       </property>
       <item>
        <widget class="QLabel" name="controlsLabel">
@@ -202,8 +202,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>855</width>
-            <height>476</height>
+            <width>857</width>
+            <height>474</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_3">
@@ -735,8 +735,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>855</width>
-            <height>427</height>
+            <width>857</width>
+            <height>429</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -1118,8 +1118,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>855</width>
-            <height>427</height>
+            <width>857</width>
+            <height>429</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -1501,8 +1501,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>855</width>
-            <height>427</height>
+            <width>857</width>
+            <height>429</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1884,8 +1884,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>855</width>
-            <height>427</height>
+            <width>857</width>
+            <height>429</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -2868,8 +2868,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>855</width>
-            <height>427</height>
+            <width>857</width>
+            <height>429</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -3129,8 +3129,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>855</width>
-            <height>476</height>
+            <width>857</width>
+            <height>478</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_6">
@@ -4000,7 +4000,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>839</width>
+            <width>841</width>
             <height>424</height>
            </rect>
           </property>
diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
index 4049caa5c..7834e027e 100644
--- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
@@ -36,19 +36,19 @@
      </property>
      <layout class="QHBoxLayout" name="toolbarLayout">
       <property name="spacing">
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="leftMargin">
-       <number>0</number>
+       <number>6</number>
       </property>
       <property name="topMargin">
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>6</number>
       </property>
       <property name="bottomMargin">
-       <number>0</number>
+       <number>2</number>
       </property>
       <item>
        <widget class="QLabel" name="controlsLabel">
@@ -203,7 +203,7 @@
             <x>0</x>
             <y>0</y>
             <width>868</width>
-            <height>436</height>
+            <height>432</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_3">
@@ -615,8 +615,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>387</height>
+            <width>101</width>
+            <height>338</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -998,8 +998,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>387</height>
+            <width>101</width>
+            <height>338</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -1381,8 +1381,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>387</height>
+            <width>101</width>
+            <height>338</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1764,8 +1764,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>387</height>
+            <width>183</width>
+            <height>340</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -2750,8 +2750,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>387</height>
+            <width>101</width>
+            <height>338</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -3011,8 +3011,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>436</height>
+            <width>709</width>
+            <height>285</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_6">
@@ -3848,7 +3848,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>852</width>
+            <width>101</width>
             <height>338</height>
            </rect>
           </property>
diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
index 7d9ccc730..d9b04b989 100644
--- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
@@ -36,19 +36,19 @@
      </property>
      <layout class="QHBoxLayout" name="toolbarLayout">
       <property name="spacing">
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="leftMargin">
-       <number>0</number>
+       <number>6</number>
       </property>
       <property name="topMargin">
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>6</number>
       </property>
       <property name="bottomMargin">
-       <number>0</number>
+       <number>2</number>
       </property>
       <item>
        <widget class="QLabel" name="controlsLabel">
@@ -203,7 +203,7 @@
             <x>0</x>
             <y>0</y>
             <width>873</width>
-            <height>477</height>
+            <height>473</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_6">
@@ -615,8 +615,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>873</width>
-            <height>428</height>
+            <width>116</width>
+            <height>424</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_16">
@@ -1050,8 +1050,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>873</width>
-            <height>428</height>
+            <width>116</width>
+            <height>424</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_15">
@@ -1485,8 +1485,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>873</width>
-            <height>428</height>
+            <width>116</width>
+            <height>424</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -1920,7 +1920,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>857</width>
+            <width>236</width>
             <height>454</height>
            </rect>
           </property>
@@ -3330,8 +3330,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>873</width>
-            <height>428</height>
+            <width>116</width>
+            <height>424</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -3643,8 +3643,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>873</width>
-            <height>477</height>
+            <width>488</width>
+            <height>292</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_4">
@@ -4241,8 +4241,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>873</width>
-            <height>428</height>
+            <width>116</width>
+            <height>424</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_11">
diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
index 1f714a7f6..2309c1773 100644
--- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
@@ -36,19 +36,19 @@
      </property>
      <layout class="QHBoxLayout" name="toolbarLayout">
       <property name="spacing">
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="leftMargin">
-       <number>0</number>
+       <number>6</number>
       </property>
       <property name="topMargin">
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>6</number>
       </property>
       <property name="bottomMargin">
-       <number>0</number>
+       <number>2</number>
       </property>
       <item>
        <widget class="QLabel" name="controlsLabel">
@@ -203,7 +203,7 @@
             <x>0</x>
             <y>0</y>
             <width>911</width>
-            <height>511</height>
+            <height>507</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_3">
@@ -615,8 +615,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>462</height>
+            <width>96</width>
+            <height>432</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -894,8 +894,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>462</height>
+            <width>96</width>
+            <height>432</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -1173,8 +1173,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>462</height>
+            <width>96</width>
+            <height>432</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1452,8 +1452,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>462</height>
+            <width>96</width>
+            <height>432</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -2403,8 +2403,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>462</height>
+            <width>96</width>
+            <height>432</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_15">
@@ -2560,8 +2560,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>511</height>
+            <width>488</width>
+            <height>292</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_4">
@@ -3173,8 +3173,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>462</height>
+            <width>96</width>
+            <height>432</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_16">
diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp
index 245af6448..478e0724c 100644
--- a/qrenderdoc/Windows/ShaderViewer.cpp
+++ b/qrenderdoc/Windows/ShaderViewer.cpp
@@ -189,8 +189,8 @@ ShaderViewer::ShaderViewer(ICaptureContext &ctx, QWidget *parent)
   }
 
   QVBoxLayout *layout = new QVBoxLayout(this);
-  layout->setSpacing(0);
-  layout->setMargin(0);
+  layout->setSpacing(3);
+  layout->setContentsMargins(3, 3, 3, 3);
   layout->addWidget(ui->toolbar);
   layout->addWidget(ui->docking);