@@ -71,25 +71,28 @@ PlatformStyle::PlatformStyle(const QString &_name, bool _imagesOnButtons, bool _
71
71
name(_name),
72
72
imagesOnButtons(_imagesOnButtons),
73
73
colorizeIcons(_colorizeIcons),
74
- useExtraSpacing(_useExtraSpacing),
75
- singleColor(0 ,0 ,0 ),
76
- textColor(0 ,0 ,0 )
74
+ useExtraSpacing(_useExtraSpacing)
75
+ {
76
+ }
77
+
78
+ QColor PlatformStyle::TextColor () const
79
+ {
80
+ return QApplication::palette ().color (QPalette::WindowText);
81
+ }
82
+
83
+ QColor PlatformStyle::SingleColor () const
77
84
{
78
- // Determine icon highlighting color
79
85
if (colorizeIcons) {
80
86
const QColor colorHighlightBg (QApplication::palette ().color (QPalette::Highlight));
81
87
const QColor colorHighlightFg (QApplication::palette ().color (QPalette::HighlightedText));
82
88
const QColor colorText (QApplication::palette ().color (QPalette::WindowText));
83
89
const int colorTextLightness = colorText.lightness ();
84
- QColor colorbase;
85
- if (abs (colorHighlightBg.lightness () - colorTextLightness) < abs (colorHighlightFg.lightness () - colorTextLightness))
86
- colorbase = colorHighlightBg;
87
- else
88
- colorbase = colorHighlightFg;
89
- singleColor = colorbase;
90
+ if (abs (colorHighlightBg.lightness () - colorTextLightness) < abs (colorHighlightFg.lightness () - colorTextLightness)) {
91
+ return colorHighlightBg;
92
+ }
93
+ return colorHighlightFg;
90
94
}
91
- // Determine text color
92
- textColor = QColor (QApplication::palette ().color (QPalette::WindowText));
95
+ return {0 , 0 , 0 };
93
96
}
94
97
95
98
QImage PlatformStyle::SingleColorImage (const QString& filename) const
0 commit comments