UI Tweaks

Author: Nico-Duduf

src/duqf_resources/styles/style.css

@@ -718,25 +718,6 @@ QToolBar #menuButton:hover {
     background-color: @color-very-dark-grey;
 }
 
-/* MAIN TOOLBAR */
-
-#mainToolBar {
-        background: @color-medium-grey;
-}
-
-#mainToolBar QWidget {
-    margin-right: @margin;
-}
-
-#mainToolBar QLabel {
-    color: @color-light-grey;
-}
-
-#windowButton {
-    width: @small-button-size;
-    height: @small-button-size;
-}
-
 /* STATUSBAR */
 
 QStatusBar {
@@ -864,3 +845,25 @@ DuQFDockTitle #windowButton {
 #duqf_block {
     background-color: @color-very-dark-grey;
 }
+
+/* ====================================== */
+/* ============ UNIQUE WIDGETS ========== */
+/* ====================================== */
+
+#mainToolBar {
+    background: @color-medium-grey;
+    border-radius: 10px;
+    margin: 5px 5px 5px 5px;
+    padding: 5px;
+}
+
+#mainToolBar > * {
+    margin-top: 5px;
+    margin-left: 5px;
+}
+
+#mainToolBar QLabel {
+    color: @color-light-grey;
+}
+
+

src/mainwindow.cpp

@@ -687,8 +687,6 @@ void MainWindow::duqf_initUi()
     // Set transparent, and draw the background in paintEvent() to have rounded corners
     setAttribute(Qt::WA_TranslucentBackground, true);
     setAttribute(Qt::WA_NoSystemBackground, true);
-    setStyleSheet("#centralWidget { background: none; }"
-                  "#mainToolBar { border-radius: 10px; margin: 5px 5px 5px 5px; }");
 
     // ===== SYSTRAY ======
     duqf_actionShowHide = new QAction("Hide " + QString(STR_INTERNALNAME), this);
@@ -723,7 +721,8 @@ void MainWindow::duqf_initUi()
 
     mainToolBar->setWindowTitle(QString(STR_FILEDESCRIPTION));
     QString focusColor = DuSettingsManager::instance()->uiFocusColor(DuSettingsManager::DarkerColor).name();
-    mainToolBar->setStyleSheet("#windowButton:hover,"
+    mainToolBar->setStyleSheet("#mainToolBar { padding: 5px; }"
+                               "#windowButton:hover,"
                                "QToolButton:hover"
                                "{ background-color:" + focusColor + "}");