From 97720a798c4f023ff9e066ab00d5008c868d1c04 Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Sat, 27 Aug 2022 01:38:52 +0200
Subject: [PATCH] Waste less space in the UI

 * Adjusted layout margins

   Nested layouts lead to lots of wasted space.
 * Removed unnecessary "Close" button

   Closing the settings dialog via "x" or the close button does not make
   a difference so it can savely be removed.
---
 forms/advanced-scene-switcher.ui | 42 ++++++++++++++++++++++++--------
 src/advanced-scene-switcher.hpp  |  2 --
 src/general.cpp                  |  5 ----
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui
index a3f8ce90..3368a676 100644
--- a/forms/advanced-scene-switcher.ui
+++ b/forms/advanced-scene-switcher.ui
@@ -45,6 +45,18 @@
        <string>AdvSceneSwitcher.generalTab.title</string>
       </attribute>
       <layout class="QHBoxLayout" name="horizontalLayout_23">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
        <item>
         <widget class="QScrollArea" name="scrollArea">
          <property name="widgetResizable">
@@ -55,8 +67,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>1024</width>
-            <height>800</height>
+            <width>957</width>
+            <height>817</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_19">
@@ -549,6 +561,15 @@
        <string>AdvSceneSwitcher.macroTab.title</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_34">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
        <item>
         <widget class="QSplitter" name="macroListMacroEditSplitter">
          <property name="orientation">
@@ -1309,6 +1330,15 @@
        <string>AdvSceneSwitcher.sceneGroupTab.title</string>
       </attribute>
       <layout class="QHBoxLayout" name="horizontalLayout_6">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
        <item>
         <widget class="QGroupBox" name="groupBox_3">
          <property name="title">
@@ -3217,7 +3247,6 @@
             </property>
             <property name="font">
              <font>
-              <weight>75</weight>
               <bold>true</bold>
              </font>
             </property>
@@ -4507,13 +4536,6 @@
      </widget>
     </widget>
    </item>
-   <item>
-    <widget class="QPushButton" name="close">
-     <property name="text">
-      <string>AdvSceneSwitcher.close</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/advanced-scene-switcher.hpp b/src/advanced-scene-switcher.hpp
index 0688c8f9..17a6d595 100644
--- a/src/advanced-scene-switcher.hpp
+++ b/src/advanced-scene-switcher.hpp
@@ -296,8 +296,6 @@ public slots:
 
 	void updateScreenRegionCursorPos();
 
-	void on_close_clicked();
-
 private:
 	bool MacroTabIsInFocus();
 
diff --git a/src/general.cpp b/src/general.cpp
index 7365bc7c..e7f495ad 100644
--- a/src/general.cpp
+++ b/src/general.cpp
@@ -6,11 +6,6 @@
 #include <QFileDialog>
 #include <QStandardPaths>
 
-void AdvSceneSwitcher::on_close_clicked()
-{
-	close();
-}
-
 void AdvSceneSwitcher::reject()
 {
 	close();