Changeset 8 for trunk/src/widgets/qtitlebar.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/widgets/qtitlebar.cpp (modified) (4 diffs)

trunk/src/widgets/qtitlebar.cpp

@@ -58 +58 @@
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
+#elif defined(Q_WS_PM)
+#include "qt_os2.h"
 #endif
 
@@ -189 +191 @@
 }
 
-#ifdef Q_WS_WIN
+#if defined (Q_WS_WIN)
 extern QRgb qt_colorref2qrgb(COLORREF col);
+#elif defined (Q_WS_PM)
+extern QRgb qt_sysclr2qrgb( LONG sysClr );
 #endif
 
@@ -196 +200 @@
 {
     QPalette pal = palette();
+
+#if defined (Q_WS_PM)
+    // we always use PM system colors for titlebars (regardless of
+    // QApplication::desktopSettingsAware()), because the simulation will
+    // most likely produce the same color both for an active and inactive title.
+    pal.setColor( QPalette::Active, QColorGroup::Highlight,
+        QColor( qt_sysclr2qrgb( SYSCLR_ACTIVETITLE ) ) );
+    pal.setColor( QPalette::Active, QColorGroup::Base,
+        pal.active().highlight() );
+    pal.setColor( QPalette::Active, QColorGroup::HighlightedText,
+        QColor( qt_sysclr2qrgb( SYSCLR_ACTIVETITLETEXT ) ) );
+    pal.setColor( QPalette::Inactive, QColorGroup::Highlight,
+        QColor( qt_sysclr2qrgb( SYSCLR_INACTIVETITLE ) ) );
+    pal.setColor( QPalette::Inactive, QColorGroup::Base,
+        pal.inactive().highlight() );
+    pal.setColor( QPalette::Inactive, QColorGroup::HighlightedText,
+        QColor( qt_sysclr2qrgb( SYSCLR_INACTIVETITLETEXT ) ) );
+#else
 
     bool colorsInitialized = FALSE;
@@ -239 +261 @@
         pal.setColor( QPalette::Inactive, QColorGroup::HighlightedText, palette().inactive().background() );
     }
+#endif // Q_WS_PM
 
     setPalette( pal );