From e548098347c5b85efc9cb15b8700cd2ec7b6a394 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Thu, 26 Oct 2023 16:58:59 +0200
Subject: [PATCH] switch between styles only in stylesheets, not through
runtime conditional
---
GUI/Support/Style/GroupBoxCollapser.cpp | 4 ----
GUI/styles/Native.stylesheet | 7 +++++++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/GUI/Support/Style/GroupBoxCollapser.cpp b/GUI/Support/Style/GroupBoxCollapser.cpp
index fdb2d704b91..d4a93cba344 100644
--- a/GUI/Support/Style/GroupBoxCollapser.cpp
+++ b/GUI/Support/Style/GroupBoxCollapser.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Support/Style/GroupBoxCollapser.h"
-#include "GUI/Support/Style/ApplicationSettings.h"
#include <QAction>
#include <QBoxLayout>
#include <QGroupBox>
@@ -81,9 +80,6 @@ GroupBoxCollapser::GroupBoxCollapser(QGroupBox* groupBox)
{
m_toggleButton = new QToolButton(groupBox);
m_toggleButton->setObjectName("GroupBoxToggler");
- if (appSettings->currentStyle() == ApplicationSettings::Style::native)
- m_toggleButton->setStyleSheet(
- "QToolButton { border: none; text-align: left; font: bold; padding: 5px}");
m_toggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
m_toggleButton->setCheckable(true);
m_toggleButton->setText(groupBox->title());
diff --git a/GUI/styles/Native.stylesheet b/GUI/styles/Native.stylesheet
index 7298d87c756..6d01b3bc773 100644
--- a/GUI/styles/Native.stylesheet
+++ b/GUI/styles/Native.stylesheet
@@ -50,6 +50,13 @@ QToolButton#ViewSelectionButton
color: white; background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop : 0 #153b4c, stop : 1 #347a9c);
}
+QToolButton#GroupBoxToggler
+{
+ border: none;
+ text-align: left; font: bold;
+ padding: 5px
+}
+
QToolButton#ViewSelectionButton:pressed
{
color: white; background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #97a8b0, stop: 1 #dae7ed);
--
GitLab