From 0b2a2a8cf7b200fdf9c9ab7de311f0df958f1975 Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Avalos Date: Sat, 11 Mar 2023 23:00:29 -0300 Subject: [PATCH] fix #8847 sketcher dialog tool buttons bad styling --- src/Gui/Stylesheets/Behave-dark.qss | 27 ++++++++++++++++++++++++++ src/Gui/Stylesheets/Dark-blue.qss | 27 ++++++++++++++++++++++++++ src/Gui/Stylesheets/Dark-contrast.qss | 27 ++++++++++++++++++++++++++ src/Gui/Stylesheets/Dark-green.qss | 27 ++++++++++++++++++++++++++ src/Gui/Stylesheets/Dark-orange.qss | 27 ++++++++++++++++++++++++++ src/Gui/Stylesheets/Darker-blue.qss | 27 ++++++++++++++++++++++++++ src/Gui/Stylesheets/Darker-green.qss | 27 ++++++++++++++++++++++++++ src/Gui/Stylesheets/Darker-orange.qss | 27 ++++++++++++++++++++++++++ src/Gui/Stylesheets/Light-blue.qss | 27 ++++++++++++++++++++++++++ src/Gui/Stylesheets/Light-green.qss | 27 ++++++++++++++++++++++++++ src/Gui/Stylesheets/Light-orange.qss | 27 ++++++++++++++++++++++++++ src/Gui/Stylesheets/ProDark.qss | 28 ++++++++++++++++++++++++++- 12 files changed, 324 insertions(+), 1 deletion(-) diff --git a/src/Gui/Stylesheets/Behave-dark.qss b/src/Gui/Stylesheets/Behave-dark.qss index fdf97a21c1..46c79a2ef2 100644 --- a/src/Gui/Stylesheets/Behave-dark.qss +++ b/src/Gui/Stylesheets/Behave-dark.qss @@ -1648,6 +1648,33 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:pressed { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #65A2E5, stop:1 #65A2E5); } +/* QToolButtons with a menu found in Sketcher task panel*/ +QSint--ActionGroup QToolButton::menu-button { + border: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding: 2px; + width: 16px; /* 16px width + 4px for border = 20px allocated above */ + outline: none; + background-color: transparent; +} + +QSint--ActionGroup QToolButton#settingsButton, +QSint--ActionGroup QToolButton#filterButton +QSint--ActionGroup QToolButton#manualUpdate { + padding: 2px; + padding-right: 20px; /* make way for the popup button */ + margin: 0px; +} + +/* to give widget inside the menu same look as regular menu */ +QSint--ActionGroup QToolButton#filterButton QListWidget { + color: #D2D8E1; + background: #232932; + padding: 0px; + margin: 0px; +} + /*================================================================================================== Radio button diff --git a/src/Gui/Stylesheets/Dark-blue.qss b/src/Gui/Stylesheets/Dark-blue.qss index b004f7891f..6edcdb6cb9 100644 --- a/src/Gui/Stylesheets/Dark-blue.qss +++ b/src/Gui/Stylesheets/Dark-blue.qss @@ -1615,6 +1615,33 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:pressed { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #3874f2, stop:1 #5e90fa); } +/* QToolButtons with a menu found in Sketcher task panel*/ +QSint--ActionGroup QToolButton::menu-button { + border: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding: 2px; + width: 16px; /* 16px width + 4px for border = 20px allocated above */ + outline: none; + background-color: transparent; +} + +QSint--ActionGroup QToolButton#settingsButton, +QSint--ActionGroup QToolButton#filterButton +QSint--ActionGroup QToolButton#manualUpdate { + padding: 2px; + padding-right: 20px; /* make way for the popup button */ + margin: 0px; +} + +/* to give widget inside the menu same look as regular menu */ +QSint--ActionGroup QToolButton#filterButton QListWidget { + color: #e0e0e0; + background-color: #5a5a5a; + padding: 0px; + margin: 0px; +} + /*================================================================================================== Radio button diff --git a/src/Gui/Stylesheets/Dark-contrast.qss b/src/Gui/Stylesheets/Dark-contrast.qss index 3606d183ce..adc247d0dc 100644 --- a/src/Gui/Stylesheets/Dark-contrast.qss +++ b/src/Gui/Stylesheets/Dark-contrast.qss @@ -1615,6 +1615,33 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:pressed { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #1b3774, stop:1 #2053c0); } +/* QToolButtons with a menu found in Sketcher task panel*/ +QSint--ActionGroup QToolButton::menu-button { + border: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding: 2px; + width: 16px; /* 16px width + 4px for border = 20px allocated above */ + outline: none; + background-color: transparent; +} + +QSint--ActionGroup QToolButton#settingsButton, +QSint--ActionGroup QToolButton#filterButton +QSint--ActionGroup QToolButton#manualUpdate { + padding: 2px; + padding-right: 20px; /* make way for the popup button */ + margin: 0px; +} + +/* to give widget inside the menu same look as regular menu */ +QSint--ActionGroup QToolButton#filterButton QListWidget { + color: #fefefe; + background-color: #111111; + padding: 0px; + margin: 0px; +} + /*================================================================================================== QComboBox inside Task Panel content diff --git a/src/Gui/Stylesheets/Dark-green.qss b/src/Gui/Stylesheets/Dark-green.qss index 1f090bb4dd..b09e735dd9 100644 --- a/src/Gui/Stylesheets/Dark-green.qss +++ b/src/Gui/Stylesheets/Dark-green.qss @@ -1614,6 +1614,33 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:pressed { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #819c0c, stop:1 #94b30f); } +/* QToolButtons with a menu found in Sketcher task panel*/ +QSint--ActionGroup QToolButton::menu-button { + border: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding: 2px; + width: 16px; /* 16px width + 4px for border = 20px allocated above */ + outline: none; + background-color: transparent; +} + +QSint--ActionGroup QToolButton#settingsButton, +QSint--ActionGroup QToolButton#filterButton +QSint--ActionGroup QToolButton#manualUpdate { + padding: 2px; + padding-right: 20px; /* make way for the popup button */ + margin: 0px; +} + +/* to give widget inside the menu same look as regular menu */ +QSint--ActionGroup QToolButton#filterButton QListWidget { + color: #e0e0e0; + background-color: #5a5a5a; + padding: 0px; + margin: 0px; +} + /*================================================================================================== Radio button diff --git a/src/Gui/Stylesheets/Dark-orange.qss b/src/Gui/Stylesheets/Dark-orange.qss index 2b1cd513d3..24d8ab3902 100644 --- a/src/Gui/Stylesheets/Dark-orange.qss +++ b/src/Gui/Stylesheets/Dark-orange.qss @@ -1615,6 +1615,33 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:pressed { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #d0970c, stop:1 #daa116); } +/* QToolButtons with a menu found in Sketcher task panel*/ +QSint--ActionGroup QToolButton::menu-button { + border: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding: 2px; + width: 16px; /* 16px width + 4px for border = 20px allocated above */ + outline: none; + background-color: transparent; +} + +QSint--ActionGroup QToolButton#settingsButton, +QSint--ActionGroup QToolButton#filterButton +QSint--ActionGroup QToolButton#manualUpdate { + padding: 2px; + padding-right: 20px; /* make way for the popup button */ + margin: 0px; +} + +/* to give widget inside the menu same look as regular menu */ +QSint--ActionGroup QToolButton#filterButton QListWidget { + color: #e0e0e0; + background-color: #5a5a5a; + padding: 0px; + margin: 0px; +} + /*================================================================================================== Radio button diff --git a/src/Gui/Stylesheets/Darker-blue.qss b/src/Gui/Stylesheets/Darker-blue.qss index 2367454529..cf53333a9a 100644 --- a/src/Gui/Stylesheets/Darker-blue.qss +++ b/src/Gui/Stylesheets/Darker-blue.qss @@ -1615,6 +1615,33 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:pressed { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #1b3774, stop:1 #2053c0); } +/* QToolButtons with a menu found in Sketcher task panel*/ +QSint--ActionGroup QToolButton::menu-button { + border: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding: 2px; + width: 16px; /* 16px width + 4px for border = 20px allocated above */ + outline: none; + background-color: transparent; +} + +QSint--ActionGroup QToolButton#settingsButton, +QSint--ActionGroup QToolButton#filterButton +QSint--ActionGroup QToolButton#manualUpdate { + padding: 2px; + padding-right: 20px; /* make way for the popup button */ + margin: 0px; +} + +/* to give widget inside the menu same look as regular menu */ +QSint--ActionGroup QToolButton#filterButton QListWidget { + color: #f5f5f5; + background: #2a2a2a; + padding: 0px; + margin: 0px; +} + /*================================================================================================== QComboBox inside Task Panel content diff --git a/src/Gui/Stylesheets/Darker-green.qss b/src/Gui/Stylesheets/Darker-green.qss index a6e72ab654..708256a327 100644 --- a/src/Gui/Stylesheets/Darker-green.qss +++ b/src/Gui/Stylesheets/Darker-green.qss @@ -1615,6 +1615,33 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:pressed { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #566214, stop:1 #74831d); } +/* QToolButtons with a menu found in Sketcher task panel*/ +QSint--ActionGroup QToolButton::menu-button { + border: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding: 2px; + width: 16px; /* 16px width + 4px for border = 20px allocated above */ + outline: none; + background-color: transparent; +} + +QSint--ActionGroup QToolButton#settingsButton, +QSint--ActionGroup QToolButton#filterButton +QSint--ActionGroup QToolButton#manualUpdate { + padding: 2px; + padding-right: 20px; /* make way for the popup button */ + margin: 0px; +} + +/* to give widget inside the menu same look as regular menu */ +QSint--ActionGroup QToolButton#filterButton QListWidget { + color: #f5f5f5; + background: #2a2a2a; + padding: 0px; + margin: 0px; +} + /*================================================================================================== QComboBox inside Task Panel content diff --git a/src/Gui/Stylesheets/Darker-orange.qss b/src/Gui/Stylesheets/Darker-orange.qss index defd6a76aa..7fc5e9874e 100644 --- a/src/Gui/Stylesheets/Darker-orange.qss +++ b/src/Gui/Stylesheets/Darker-orange.qss @@ -1609,6 +1609,33 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:pressed { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #624b14, stop:1 #b28416); } +/* QToolButtons with a menu found in Sketcher task panel*/ +QSint--ActionGroup QToolButton::menu-button { + border: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding: 2px; + width: 16px; /* 16px width + 4px for border = 20px allocated above */ + outline: none; + background-color: transparent; +} + +QSint--ActionGroup QToolButton#settingsButton, +QSint--ActionGroup QToolButton#filterButton +QSint--ActionGroup QToolButton#manualUpdate { + padding: 2px; + padding-right: 20px; /* make way for the popup button */ + margin: 0px; +} + +/* to give widget inside the menu same look as regular menu */ +QSint--ActionGroup QToolButton#filterButton QListWidget { + color: #f5f5f5; + background-color: #2a2a2a; + padding: 0px; + margin: 0px; +} + /*================================================================================================== QComboBox inside Task Panel content diff --git a/src/Gui/Stylesheets/Light-blue.qss b/src/Gui/Stylesheets/Light-blue.qss index 2136fdcee3..cad26b097a 100644 --- a/src/Gui/Stylesheets/Light-blue.qss +++ b/src/Gui/Stylesheets/Light-blue.qss @@ -1612,6 +1612,33 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:pressed { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #3874f2, stop:1 #5e90fa); } +/* QToolButtons with a menu found in Sketcher task panel*/ +QSint--ActionGroup QToolButton::menu-button { + border: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding: 2px; + width: 16px; /* 16px width + 4px for border = 20px allocated above */ + outline: none; + background-color: transparent; +} + +QSint--ActionGroup QToolButton#settingsButton, +QSint--ActionGroup QToolButton#filterButton +QSint--ActionGroup QToolButton#manualUpdate { + padding: 2px; + padding-right: 20px; /* make way for the popup button */ + margin: 0px; +} + +/* to give widget inside the menu same look as regular menu */ +QSint--ActionGroup QToolButton#filterButton QListWidget { + color: black; + background: #f5f5f5; + padding: 0px; + margin: 0px; +} + /*================================================================================================== Radio button diff --git a/src/Gui/Stylesheets/Light-green.qss b/src/Gui/Stylesheets/Light-green.qss index a384a48428..5c575cce93 100644 --- a/src/Gui/Stylesheets/Light-green.qss +++ b/src/Gui/Stylesheets/Light-green.qss @@ -1612,6 +1612,33 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:pressed { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #819c0c, stop:1 #94b30f); } +/* QToolButtons with a menu found in Sketcher task panel*/ +QSint--ActionGroup QToolButton::menu-button { + border: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding: 2px; + width: 16px; /* 16px width + 4px for border = 20px allocated above */ + outline: none; + background-color: transparent; +} + +QSint--ActionGroup QToolButton#settingsButton, +QSint--ActionGroup QToolButton#filterButton +QSint--ActionGroup QToolButton#manualUpdate { + padding: 2px; + padding-right: 20px; /* make way for the popup button */ + margin: 0px; +} + +/* to give widget inside the menu same look as regular menu */ +QSint--ActionGroup QToolButton#filterButton QListWidget { + color: black; + background: #f5f5f5; + padding: 0px; + margin: 0px; +} + /*================================================================================================== Radio button diff --git a/src/Gui/Stylesheets/Light-orange.qss b/src/Gui/Stylesheets/Light-orange.qss index 65b02d63dd..f6ff4c8bd1 100644 --- a/src/Gui/Stylesheets/Light-orange.qss +++ b/src/Gui/Stylesheets/Light-orange.qss @@ -1612,6 +1612,33 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:pressed { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #d0970c, stop:1 #daa116); } +/* QToolButtons with a menu found in Sketcher task panel*/ +QSint--ActionGroup QToolButton::menu-button { + border: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding: 2px; + width: 16px; /* 16px width + 4px for border = 20px allocated above */ + outline: none; + background-color: transparent; +} + +QSint--ActionGroup QToolButton#settingsButton, +QSint--ActionGroup QToolButton#filterButton +QSint--ActionGroup QToolButton#manualUpdate { + padding: 2px; + padding-right: 20px; /* make way for the popup button */ + margin: 0px; +} + +/* to give widget inside the menu same look as regular menu */ +QSint--ActionGroup QToolButton#filterButton QListWidget { + color: black; + background: #f5f5f5; + padding: 0px; + margin: 0px; +} + /*================================================================================================== Radio button diff --git a/src/Gui/Stylesheets/ProDark.qss b/src/Gui/Stylesheets/ProDark.qss index d1b65a7f14..c57d0e10c8 100644 --- a/src/Gui/Stylesheets/ProDark.qss +++ b/src/Gui/Stylesheets/ProDark.qss @@ -1815,6 +1815,32 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:pressed { background-color: #557BB6; } +/* QToolButtons with a menu found in Sketcher task panel*/ +QSint--ActionGroup QToolButton::menu-button { + border: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding: 2px; + width: 16px; /* 16px width + 4px for border = 20px allocated above */ + outline: none; + background-color: transparent; +} + +QSint--ActionGroup QToolButton#settingsButton, +QSint--ActionGroup QToolButton#filterButton +QSint--ActionGroup QToolButton#manualUpdate { + padding: 2px; + padding-right: 20px; /* make way for the popup button */ + margin: 0px; +} + +/* to give widget inside the menu same look as regular menu */ +QSint--ActionGroup QToolButton#filterButton QListWidget { + color: #f5f5f5; + background: #2a2a2a; + padding: 0px; + margin: 0px; +} /*================================================================================================== QComboBox inside Task Panel content @@ -1824,7 +1850,7 @@ QComboBox inside Task Panel content /* TODO: external border not working, in the rest of GUI works setting up Qmenu background color but inside Task Panel it doesn't... */ QSint--ActionGroup QFrame[class="content"] QMenu, QSint--ActionGroup QFrame[class="content"] QMenu::item { - background-color: #696969; + background-color: #2a2a2a; } QSint--ActionGroup QFrame[class="content"] QComboBox QAbstractItemView {