summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-13 19:37:33 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-13 19:37:33 +0000
commit94b61aed0707e9eca84a818a5281542be03b9ca3 (patch)
tree033dcc4c5a5beb18e5d1863f25f1feda9c1870e7
parente29fcfc4166b893df9fa6825e16d41064d3bade5 (diff)
downloadtdebase-94b61aed0707e9eca84a818a5281542be03b9ca3.tar.gz
tdebase-94b61aed0707e9eca84a818a5281542be03b9ca3.zip
Force repaint of background on desktop switch when desktop lock is enabled
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1253273 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kdesktop/lock/lockprocess.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 48bdb1395..71b377227 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -1325,8 +1325,15 @@ void LockProcess::suspend()
void LockProcess::resume( bool force )
{
- if( !force && (!mDialogs.isEmpty() || !mVisibility ))
- return; // no resuming with dialog visible or when not visible
+ if( !force && (!mDialogs.isEmpty() || !mVisibility )) {
+ // no resuming with dialog visible or when not visible
+ if (backingPixmap.isNull())
+ setBackgroundColor(black);
+ else
+ setBackgroundPixmap(backingPixmap);
+ erase();
+ return;
+ }
if ((mSuspended) && (mHackProc.isRunning()))
{
XForceScreenSaver(qt_xdisplay(), ScreenSaverReset );