[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kstyles/kthemestyle
From:       Maks Orlovich <maksim () kde ! org>
Date:       2004-01-11 20:21:25
Message-ID: 20040111202125.B83868FF9 () office ! kde ! org
[Download RAW message or body]

CVS commit by orlovich: 

Apply a modified version of a patch from  Oliver Bausinger (bausi at the host bausi \
tld org), to fix  kicker w/transparent background and KThemeStyle. This is not the \
clean way of doing it, but it's a safe  way of doing it, which is preferrable at this \
                point.
CCMAIL: 69897-done@bugs.kde.org


  M +11 -11    kthemestyle.cpp   1.43
  M +2 -1      kthemestyle.h   1.16


--- kdelibs/kstyles/kthemestyle/kthemestyle.cpp  #1.42:1.43
@@ -395,5 +395,5 @@ int KThemeStyle::pixelMetric ( PixelMetr
 KThemeStyle::KThemeStyle( const QString& configDir, const QString &configFile )
         : KThemeBase( configDir, configFile ), paletteSaved( false ), polishLock( \
                false ), menuCache( 0 ), vsliderCache( 0 ),
-         brushHandle( 0 ), brushHandleSet( false )
+         brushHandle( 0 ), brushHandleSet( false ), kickerMode( false )
 {
     mtfstyle = QStyleFactory::create( "Motif" );
@@ -410,6 +410,9 @@ KThemeStyle::~KThemeStyle()
 
 
-void KThemeStyle::polish( QApplication * /*app*/ )
-{}
+void KThemeStyle::polish( QApplication * app )
+{
+    if (!qstrcmp(app->argv()[0], "kicker"))
+        kickerMode = true;
+}
 
 
@@ -502,5 +505,7 @@ void KThemeStyle::polish( QWidget *w )
 
 
-    if (w->backgroundPixmap() && !w->isTopLevel())
+    if (w->backgroundPixmap() && !w->isTopLevel() && 
+        (!kickerMode || 
+        (!w->inherits("TaskBar") && !w->inherits("TaskBarContainer") && \
!w->inherits("TaskbarApplet") && !w->inherits("ContainerArea") && \
!w->inherits("AppletHandle"))))  {
         //The brushHandle check verifies that the bg pixmap is actually the brush..
@@ -2364,9 +2369,4 @@ int KThemeStyle::popupMenuItemHeight( bo
 }
 
-
-
-
 #include "kthemestyle.moc"
-
-
-
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent on;

--- kdelibs/kstyles/kthemestyle/kthemestyle.h  #1.15:1.16
@@ -205,4 +205,5 @@ protected:
     Qt::HANDLE brushHandle;
     bool brushHandleSet;
+    bool kickerMode;
 
 protected slots:


[prev in list] [next in list] [prev in thread] [next in thread]