From 73f3f4e6b3c65b72ebb96e62510507e7f792d87e Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Mon, 24 Sep 2012 12:55:21 +0200 Subject: [PATCH] Some improvements to the system Mac palette Change-Id: I0c3c306db440a9a230a0916e7ee1eb27b072d057 Reviewed-by: Jens Bache-Wiig --- src/plugins/platforms/cocoa/qcocoasystemsettings.mm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm index f7e4ab0838..53542f2be6 100644 --- a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm +++ b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm @@ -107,10 +107,10 @@ QPalette * qt_mac_createSystemPalette() QColor qc; // Standard palette initialization (copied from Qt 4 styles) - QColor background = QColor(0xd4, 0xd0, 0xc8); // win 2000 grey - QColor light(background.lighter()); - QColor dark(background.darker()); - QColor mid(Qt::gray); + QColor background = QColor(237, 237, 237); + QColor light(background.lighter(110)); + QColor dark(background.darker(160)); + QColor mid(background.darker(140)); QPalette *palette = new QPalette(Qt::black, background, light, dark, mid, Qt::black, Qt::white); palette->setBrush(QPalette::Disabled, QPalette::WindowText, dark); @@ -127,10 +127,7 @@ QPalette * qt_mac_createSystemPalette() palette->setBrush(QPalette::Inactive, QPalette::Highlight, qc); palette->setBrush(QPalette::Disabled, QPalette::Highlight, qc); - palette->setBrush(QPalette::Active, QPalette::Shadow, qt_mac_colorForTheme(kThemeBrushButtonActiveDarkShadow)); - qc = qt_mac_colorForTheme(kThemeBrushButtonInactiveDarkShadow); - palette->setBrush(QPalette::Inactive, QPalette::Shadow, qc); - palette->setBrush(QPalette::Disabled, QPalette::Shadow, qc); + palette->setBrush(QPalette::Shadow, background.darker(170)); qc = qt_mac_colorForThemeTextColor(kThemeTextColorDialogActive); palette->setColor(QPalette::Active, QPalette::Text, qc);