rpms/kdebase-workspace/devel kdebase-workspace-4.0.2-wallpaper-desktop.patch, NONE, 1.1 kdebase-workspace.spec, 1.49, 1.50

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26397

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.2-wallpaper-desktop.patch 
Log Message:
- apply upstream patch to fix changing wallpaper causes desktop to go white


kdebase-workspace-4.0.2-wallpaper-desktop.patch:

--- NEW FILE kdebase-workspace-4.0.2-wallpaper-desktop.patch ---
Index: workspace/plasma/containments/desktop/desktop.cpp
===================================================================
--- workspace/plasma/containments/desktop/desktop.cpp	(Revision 783863)
+++ workspace/plasma/containments/desktop/desktop.cpp	(Revision 783864)
@@ -64,9 +64,7 @@
       m_logoutAction(0),
       m_configDialog(0),
       m_wallpaperPath(0),
-      m_renderer(resolution(), 1.0),
-      m_fadeOutAnimId(0),
-      m_fadeInAnimId(0)
+      m_renderer(resolution(), 1.0)
 {
     qRegisterMetaType<QImage>("QImage");
     qRegisterMetaType<QPersistentModelIndex>("QPersistentModelIndex");
@@ -276,19 +274,7 @@
 void DefaultDesktop::updateBackground(int token, const QImage &img)
 {
     if (m_current_renderer_token == token) {
-        QPixmap oldBitmapBackground;
-        if (!m_bitmapBackground.isNull()) {
-            oldBitmapBackground = m_bitmapBackground;
-        }
         m_bitmapBackground = QPixmap::fromImage(img);
-
-        if (!oldBitmapBackground.isNull()) {
-            m_fadeOutAnimId = Plasma::Phase::self()->animateElement(this, Plasma::Phase::ElementDisappear);
-            Plasma::Phase::self()->setAnimationPixmap(m_fadeOutAnimId, oldBitmapBackground);
-            m_fadeInAnimId = Plasma::Phase::self()->animateElement(this, Plasma::Phase::ElementAppear);
-            Plasma::Phase::self()->setAnimationPixmap(m_fadeInAnimId, m_bitmapBackground);
-        }
-
         update();
     }
 }
@@ -431,22 +417,13 @@
         painter->resetTransform();
     }
 
-    if (m_fadeOutAnimId || m_fadeInAnimId) {
-        if (m_fadeOutAnimId) {
-            painter->drawPixmap(option->exposedRect, Plasma::Phase::self()->animationResult(m_fadeOutAnimId), option->exposedRect);
-        }
-        if (m_fadeInAnimId) {
-            painter->drawPixmap(option->exposedRect, Plasma::Phase::self()->animationResult(m_fadeInAnimId), option->exposedRect);
-        }
-    } else if (!m_bitmapBackground.isNull()) {
-        // blit the background (saves all the per-pixel-products that blending does)
-        painter->setCompositionMode(QPainter::CompositionMode_Source);
+    // blit the background (saves all the per-pixel-products that blending does)
+    painter->setCompositionMode(QPainter::CompositionMode_Source);
 
-        // for pixmaps we draw only the exposed part (untransformed since the
-        // bitmapBackground already has the size of the viewport)
-        painter->drawPixmap(option->exposedRect, m_bitmapBackground, option->exposedRect);
-        //kDebug() << "draw pixmap of background to" << option->exposedRect;
-    }
+    // for pixmaps we draw only the exposed part (untransformed since the
+    // bitmapBackground already has the size of the viewport)
+    painter->drawPixmap(option->exposedRect, m_bitmapBackground, option->exposedRect);
+    //kDebug() << "draw pixmap of background to" << option->exposedRect;
 
     // restore transformation and composition mode
     painter->restore();
Index: workspace/plasma/containments/desktop/desktop.h
===================================================================
--- workspace/plasma/containments/desktop/desktop.h	(Revision 783863)
+++ workspace/plasma/containments/desktop/desktop.h	(Revision 783864)
@@ -128,9 +128,6 @@
 
     //Desktop icons
     static IconLoader *s_icons;
-
-    Plasma::Phase::AnimId m_fadeOutAnimId;
-    Plasma::Phase::AnimId m_fadeInAnimId;
 };
 
 #endif // PLASMA_PANEL_H


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdebase-workspace.spec	10 Mar 2008 14:52:15 -0000	1.49
+++ kdebase-workspace.spec	12 Mar 2008 17:01:11 -0000	1.50
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.2
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -22,6 +22,7 @@
 Patch100: kdebase-workspace-4.0.2-kde#155362.patch
 # upstream patch
 Patch101: kdebase-workspace-4.0.x-kcontrol-crash.patch
+Patch102: kdebase-workspace-4.0.2-wallpaper-desktop.patch
 
 # upgrade path for former kde-redhat'ers
 Obsoletes: kdebase-kdm < 6:%{version}-%{release}
@@ -113,6 +114,7 @@
 # upstream patches
 %patch100 -p1 -b .kde#155362
 %patch101 -p1 -b .kcontrol-crash
+%patch102 -p1 -b .wallpaper-desktop
 
 %build
 
@@ -225,6 +227,9 @@
 
 
 %changelog
+* Wed Mar 12 2008 Than Ngo <than at redhat.com> 4.0.2-7
+- apply upstream patch to fix changing wallpaper causes desktop to go white
+
 * Mon Mar 10 2008 Than Ngo <than at redhat.com> 4.0.2-6
 - add gestures=false in kde-settings, remove kdebase-workspace-4.0.2-Gestures.patch