File kde41-update.diff of Package compiz

Overview Repositories Revisions Requests Users Attributes Meta

File kde41-update.diff of Package compiz (Revision 5255eddaa07f6566986cd7269e150e73)

Currently displaying revision 5255eddaa07f6566986cd7269e150e73 , Show latest

--- kde/window-decorator-kde4/decorator.cpp
+++ kde/window-decorator-kde4/decorator.cpp
@@ -237,8 +237,7 @@ KWD::Decorator::enableDecorations (Time timestamp,
 
     connect (&mIdleTimer, SIGNAL (timeout ()), SLOT (processDamage ()));
 
-    connect (Plasma::Theme::self (), SIGNAL (changed ()),
-	     SLOT (plasmaThemeChanged ()));
+    connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), SLOT(plasmaThemeChanged()));
 
     // select for client messages
     XSelectInput (QX11Info::display(), QX11Info::appRootWindow(),
--- kde/window-decorator-kde4/switcher.cpp
+++ kde/window-decorator-kde4/switcher.cpp
@@ -43,7 +43,7 @@ mId (id)
 {
     QPalette palette;
     long     prop[4];
-    QColor   color = Plasma::Theme::self ()->textColor ();
+    QColor   color = Plasma::Theme::defaultTheme ()->color(Plasma::Theme::TextColor);
 
     mBackground = new Plasma::Svg("widgets/background");
 
@@ -51,7 +51,7 @@ mId (id)
     mBorder.right  = mBackground->elementSize ("right").width ();
     mBorder.top    = mBackground->elementSize ("top").height ();
     mBorder.bottom = mBackground->elementSize ("bottom").height () +
-		     Plasma::Theme::self ()->fontMetrics ().height () + 10;
+		     Plasma::Theme::defaultTheme ()->fontMetrics ().height () + 10;
 
     mContext.extents.left   = mBorder.left;
     mContext.extents.right  = mBorder.right;
@@ -232,8 +232,8 @@ KWD::Switcher::redrawPixmap ()
 void
 KWD::Switcher::update ()
 {
-    QFontMetrics fm = Plasma::Theme::self ()->fontMetrics ();
-    QFont font (Plasma::Theme::self ()->font ());
+    QFontMetrics fm = Plasma::Theme::defaultTheme ()->fontMetrics ();
+    QFont font (Plasma::Theme::defaultTheme ()->font (Plasma::Theme::DefaultFont));
     QString name;
     QPainter p (&mPixmap);
 
@@ -257,7 +257,7 @@ KWD::Switcher::update ()
     mBackground->resize ();
 
     p.setFont (font);
-    p.setBrush (QBrush (Plasma::Theme::self()->backgroundColor()));
+    p.setBrush (QBrush (Plasma::Theme::defaultTheme()->color(Plasma::Theme::BackgroundColor)));
 
     p.drawText ((mPixmap.width () - fm.width (name)) / 2,
                 mBorder.top + mGeometry.height () + 5 + fm.ascent (), name);
--- kde/window-decorator-kde4/switcher.cpp
+++ kde/window-decorator-kde4/switcher.cpp
@@ -167,7 +167,7 @@ KWD::Switcher::redrawPixmap ()
     mBackground->paint (&p, QRect (rightOffset, bottomOffset,
 			rightWidth, bottomHeight), "bottomright");
 
-    if (mBackground->elementExists ("hint-stretch-borders")) {
+    if (mBackground->hasElement ("hint-stretch-borders")) {
 	mBackground->paint (&p, QRect (leftOffset, contentTop,
 			    leftWidth, contentHeight), "left");
 	mBackground->paint (&p, QRect (rightOffset, contentTop,
--- kde/window-decorator-kde4/switcher.cpp
+++ kde/window-decorator-kde4/switcher.cpp
@@ -45,7 +45,8 @@ mId (id)
     long     prop[4];
     QColor   color = Plasma::Theme::defaultTheme ()->color(Plasma::Theme::TextColor);
 
-    mBackground = new Plasma::Svg("widgets/background");
+    mBackground = new Plasma::Svg();
+    mBackground->setImagePath("widgets/background");
 
     mBorder.left   = mBackground->elementSize ("left").width ();
     mBorder.right  = mBackground->elementSize ("right").width ();

Places

File kde41-update.diff of Package compiz (Revision 5255eddaa07f6566986cd7269e150e73)

Places