From 48d4a7492371a2ed411a905a0e2d49f649040008 Mon Sep 17 00:00:00 2001 From: MisterMaker Date: Mon, 4 Dec 2023 15:44:05 +0100 Subject: [PATCH] [Stylesheets] Fix for new settings menu (#11609) It can probably use some more tweaks but this way it is bug free. --- src/Gui/Stylesheets/Behave-dark.qss | 23 +++++++++++++++++++++++ src/Gui/Stylesheets/Dark-contrast.qss | 24 ++++++++++++++++++++++++ src/Gui/Stylesheets/Dark-modern.qss | 24 ++++++++++++++++++++++++ src/Gui/Stylesheets/Dark.qss | 24 ++++++++++++++++++++++++ src/Gui/Stylesheets/Darker.qss | 23 +++++++++++++++++++++++ src/Gui/Stylesheets/Light-modern.qss | 26 +++++++++++++++++++++++++- src/Gui/Stylesheets/Light.qss | 26 +++++++++++++++++++++++++- src/Gui/Stylesheets/ProDark.qss | 24 ++++++++++++++++++++++++ 8 files changed, 192 insertions(+), 2 deletions(-) diff --git a/src/Gui/Stylesheets/Behave-dark.qss b/src/Gui/Stylesheets/Behave-dark.qss index 31328a9417..7c3f49bf0e 100644 --- a/src/Gui/Stylesheets/Behave-dark.qss +++ b/src/Gui/Stylesheets/Behave-dark.qss @@ -2388,3 +2388,26 @@ Gui--UrlLabel { text-decoration : underline; } +/*================================================================================================== +Settings menu #groupsTreeView: +==================================================================================================*/ + +QTreeView::branch#groupsTreeView:closed:has-children:has-siblings { + border-image: none 0; + } + + QTreeView::branch#groupsTreeView:open:has-children:has-siblings { + border-image: none 0; + } + + QTreeView::branch#groupsTreeView:open:has-children:!has-siblings { + border-image: none 0; + } + + QTreeView::branch#groupsTreeView:has-children:!has-siblings:closed { + border-image: none 0; + } + + QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item { + border-image: none 0; + } diff --git a/src/Gui/Stylesheets/Dark-contrast.qss b/src/Gui/Stylesheets/Dark-contrast.qss index 05a94cc74a..239863971e 100644 --- a/src/Gui/Stylesheets/Dark-contrast.qss +++ b/src/Gui/Stylesheets/Dark-contrast.qss @@ -2343,3 +2343,27 @@ Gui--UrlLabel { color : rgba(0,91,255,255); /* Deep sky blue */ text-decoration : underline; } + +/*================================================================================================== +Settings menu #groupsTreeView: +==================================================================================================*/ + +QTreeView::branch#groupsTreeView:closed:has-children:has-siblings { + border-image: none 0; + } + + QTreeView::branch#groupsTreeView:open:has-children:has-siblings { + border-image: none 0; + } + + QTreeView::branch#groupsTreeView:open:has-children:!has-siblings { + border-image: none 0; + } + + QTreeView::branch#groupsTreeView:has-children:!has-siblings:closed { + border-image: none 0; + } + + QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item { + border-image: none 0; + } diff --git a/src/Gui/Stylesheets/Dark-modern.qss b/src/Gui/Stylesheets/Dark-modern.qss index 97d987f19b..8b00479925 100644 --- a/src/Gui/Stylesheets/Dark-modern.qss +++ b/src/Gui/Stylesheets/Dark-modern.qss @@ -2716,3 +2716,27 @@ QMdiSubWindow:hover { QMdiSubWindow:active { border:2px solid @ThemeAccentColor1; } + +/*================================================================================================== +Settings menu #groupsTreeView: +==================================================================================================*/ + +QTreeView::branch#groupsTreeView:closed:has-children:has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:open:has-children:has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:open:has-children:!has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:has-children:!has-siblings:closed { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item { + border-image: none 0; +} diff --git a/src/Gui/Stylesheets/Dark.qss b/src/Gui/Stylesheets/Dark.qss index 3c0c580f9f..2e79dfc26b 100644 --- a/src/Gui/Stylesheets/Dark.qss +++ b/src/Gui/Stylesheets/Dark.qss @@ -2694,3 +2694,27 @@ QMdiSubWindow:hover { QMdiSubWindow:active { border:2px solid @ThemeAccentColor1; } + +/*================================================================================================== +Settings menu #groupsTreeView: +==================================================================================================*/ + +QTreeView::branch#groupsTreeView:closed:has-children:has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:open:has-children:has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:open:has-children:!has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:has-children:!has-siblings:closed { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item { + border-image: none 0; +} diff --git a/src/Gui/Stylesheets/Darker.qss b/src/Gui/Stylesheets/Darker.qss index 7be182e32b..c4aa990006 100644 --- a/src/Gui/Stylesheets/Darker.qss +++ b/src/Gui/Stylesheets/Darker.qss @@ -2701,3 +2701,26 @@ QMdiSubWindow:active { border:2px solid @ThemeAccentColor1; } +/*================================================================================================== +Settings menu #groupsTreeView: +==================================================================================================*/ + +QTreeView::branch#groupsTreeView:closed:has-children:has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:open:has-children:has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:open:has-children:!has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:has-children:!has-siblings:closed { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item { + border-image: none 0; +} diff --git a/src/Gui/Stylesheets/Light-modern.qss b/src/Gui/Stylesheets/Light-modern.qss index b65ddc979a..e34df5d514 100644 --- a/src/Gui/Stylesheets/Light-modern.qss +++ b/src/Gui/Stylesheets/Light-modern.qss @@ -2665,4 +2665,28 @@ QMdiSubWindow:hover { QMdiSubWindow:active { border:2px solid @ThemeAccentColor1; -} \ No newline at end of file +} + +/*================================================================================================== +Settings menu #groupsTreeView: +==================================================================================================*/ + +QTreeView::branch#groupsTreeView:closed:has-children:has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:open:has-children:has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:open:has-children:!has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:has-children:!has-siblings:closed { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item { + border-image: none 0; +} diff --git a/src/Gui/Stylesheets/Light.qss b/src/Gui/Stylesheets/Light.qss index aca9bc859e..e5821a844b 100644 --- a/src/Gui/Stylesheets/Light.qss +++ b/src/Gui/Stylesheets/Light.qss @@ -2647,4 +2647,28 @@ QMdiSubWindow:hover { QMdiSubWindow:active { border:2px solid @ThemeAccentColor1; -} \ No newline at end of file +} + +/*================================================================================================== +Settings menu #groupsTreeView: +==================================================================================================*/ + +QTreeView::branch#groupsTreeView:closed:has-children:has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:open:has-children:has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:open:has-children:!has-siblings { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:has-children:!has-siblings:closed { + border-image: none 0; +} + +QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item { + border-image: none 0; +} diff --git a/src/Gui/Stylesheets/ProDark.qss b/src/Gui/Stylesheets/ProDark.qss index 41a6558ebb..87f9fa1c07 100644 --- a/src/Gui/Stylesheets/ProDark.qss +++ b/src/Gui/Stylesheets/ProDark.qss @@ -2557,3 +2557,27 @@ PREFERENCES PACKS Gui--Dialog--DlgSettingsGeneral > QGroupBox > QGroupBox > QTableWidget > QWidget > QPushButton { margin: 0px; } + +/*================================================================================================== +Settings menu #groupsTreeView: +==================================================================================================*/ + +QTreeView::branch#groupsTreeView:closed:has-children:has-siblings { + border-image: none 0; + } + + QTreeView::branch#groupsTreeView:open:has-children:has-siblings { + border-image: none 0; + } + + QTreeView::branch#groupsTreeView:open:has-children:!has-siblings { + border-image: none 0; + } + + QTreeView::branch#groupsTreeView:has-children:!has-siblings:closed { + border-image: none 0; + } + + QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item { + border-image: none 0; + }