From f1aac744eb36c2eafc2b371dbced18f778b85a9f Mon Sep 17 00:00:00 2001 From: zeljko Date: Sun, 23 May 2010 11:13:29 +0000 Subject: [PATCH] Qt: take into account clDefault if theme or palette changes. git-svn-id: trunk@25588 - --- lcl/interfaces/qt/qtwidgets.pas | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lcl/interfaces/qt/qtwidgets.pas b/lcl/interfaces/qt/qtwidgets.pas index 9478f77893..b5dbe521e8 100644 --- a/lcl/interfaces/qt/qtwidgets.pas +++ b/lcl/interfaces/qt/qtwidgets.pas @@ -2023,8 +2023,12 @@ begin begin OldColor := Palette.CurrentColor; // now set our fpalette color from LCL - Color := ColorToRGB(LCLObject.Color); - QColor_fromRgb(@QColor,Red(Color),Green(Color),Blue(Color)); + if LCLObject.Color <> clDefault then + begin + Color := ColorToRGB(LCLObject.Color); + QColor_fromRgb(@QColor,Red(Color),Green(Color),Blue(Color)); + end else + QColor := Palette.DefaultColor; if not EqualTQColor(OldColor, QColor) then begin Palette.ReloadPaletteBegin;