Fix windowtonext/previous desktop shortcut.
CCMAIL: 87251-done@bugs.kde.org svn path=/trunk/kdebase/kwin/; revision=342167
This commit is contained in:
parent
7e4f0508cf
commit
11198bc7fd
1 changed files with 12 additions and 6 deletions
|
@ -710,9 +710,12 @@ void Workspace::slotWindowToNextDesktop()
|
||||||
d = 1;
|
d = 1;
|
||||||
if (active_client && !active_client->isDesktop()
|
if (active_client && !active_client->isDesktop()
|
||||||
&& !active_client->isDock() && !active_client->isTopMenu())
|
&& !active_client->isDock() && !active_client->isTopMenu())
|
||||||
sendClientToDesktop(active_client,d,true);
|
{
|
||||||
setCurrentDesktop(d);
|
setClientIsMoving( active_client );
|
||||||
popupinfo->showInfo( desktopName(currentDesktop()) );
|
setCurrentDesktop( d );
|
||||||
|
setClientIsMoving( NULL );
|
||||||
|
popupinfo->showInfo( desktopName(currentDesktop()) );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@ -725,9 +728,12 @@ void Workspace::slotWindowToPreviousDesktop()
|
||||||
d = numberOfDesktops();
|
d = numberOfDesktops();
|
||||||
if (active_client && !active_client->isDesktop()
|
if (active_client && !active_client->isDesktop()
|
||||||
&& !active_client->isDock() && !active_client->isTopMenu())
|
&& !active_client->isDock() && !active_client->isTopMenu())
|
||||||
sendClientToDesktop(active_client,d,true);
|
{
|
||||||
setCurrentDesktop(d);
|
setClientIsMoving( active_client );
|
||||||
popupinfo->showInfo( desktopName(currentDesktop()) );
|
setCurrentDesktop( d );
|
||||||
|
setClientIsMoving( NULL );
|
||||||
|
popupinfo->showInfo( desktopName(currentDesktop()) );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|
Loading…
Reference in a new issue