Fix desktop switch while lock process is engaged

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1253075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent a278c295b0
commit 06f2c11087

@ -131,7 +131,7 @@ extern bool trinity_desktop_lock_forced;
bool trinity_desktop_lock_autohide_lockdlg = TRUE; bool trinity_desktop_lock_autohide_lockdlg = TRUE;
#define ENABLE_CONTINUOUS_LOCKDLG_DISPLAY \ #define ENABLE_CONTINUOUS_LOCKDLG_DISPLAY \
mForceContinualLockDisplayTimer->start(100, FALSE); \ if (!mForceContinualLockDisplayTimer->isActive()) mForceContinualLockDisplayTimer->start(100, FALSE); \
trinity_desktop_lock_autohide_lockdlg = FALSE; trinity_desktop_lock_autohide_lockdlg = FALSE;
#define DISABLE_CONTINUOUS_LOCKDLG_DISPLAY \ #define DISABLE_CONTINUOUS_LOCKDLG_DISPLAY \
@ -141,10 +141,10 @@ trinity_desktop_lock_autohide_lockdlg = TRUE;
//=========================================================================== //===========================================================================
// //
// Screen saver handling process. Handles screensaver window, // Screen saver handling process. Handles screensaver window,
// starting screensaver hacks, and password entry.f // starting screensaver hacks, and password entry.
// //
LockProcess::LockProcess(bool child, bool useBlankOnly) LockProcess::LockProcess(bool child, bool useBlankOnly)
: TQWidget(0L, "saver window", (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)(WStyle_StaysOnTop|WStyle_Customize | WStyle_NoBorder)):((WFlags)WX11BypassWM))), : TQWidget(0L, "saver window", (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)(WStyle_StaysOnTop|WStyle_Customize|WStyle_NoBorder)):((WFlags)WX11BypassWM))),
mOpenGLVisual(0), mOpenGLVisual(0),
child_saver(child), child_saver(child),
mParent(0), mParent(0),
@ -1250,6 +1250,7 @@ void LockProcess::suspend()
if (trinity_desktop_lock_use_system_modal_dialogs) { if (trinity_desktop_lock_use_system_modal_dialogs) {
mSuspended = true; mSuspended = true;
stopHack(); stopHack();
ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
} }
else { else {
TQString hackStatus; TQString hackStatus;

Loading…
Cancel
Save