gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

Do not change workspace during deiconify animation

Browse Source 
Paul Harris reported that using the mouse wheel over a miniwindow
would deiconify it to a different workspace than the original one
where it was iconified.

This happens because after the window begins to be deiconified the
"residual" mouse wheel scrolling hits the workspace background, and
Window Maker changes workspace with wWorkspaceRelativeChange().

But if it all happens fast enough (so the deiconification animation
did not finish yet) the workspace will have changed before the
window reaches its final deiconified destination, leading to
the situation that Paul described in the link below.

So to avoid this, let's set a 'ignore_wks_change' variable
from wDeiconifyWindow() and make wWorkspaceRelativeChange() respect it.

Original report: http://lists.windowmaker.info/dev/msg00821.html
This commit is contained in:
Carlos R. Mafra
2009-12-26 21:09:10 +01:00
parent efa31f30b2
commit a2133e8e2f
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/actions.c
View File

@@ -49,6 +49,8 @@
#include "xinerama.h"
/****** Global Variables ******/
int ignore_wks_change = 0;
extern Time LastTimestamp;
extern Time LastFocusChange;
@@ -1109,6 +1111,9 @@ void wIconifyWindow(WWindow * wwin)
void wDeiconifyWindow(WWindow * wwin)
{
/* Let's avoid changing workspace while deiconifying */
ignore_wks_change = 1;
/* we're hiding for show_desktop */
int netwm_hidden = wwin->flags.net_show_desktop &&
wwin->frame->workspace != wwin->screen_ptr->current_workspace;
@@ -1230,6 +1235,8 @@ void wDeiconifyWindow(WWindow * wwin)
/* In case we were shaded and iconified, also unshade */
if (!netwm_hidden)
wUnshadeWindow(wwin);
ignore_wks_change = 0;
}
static void hideWindow(WIcon * icon, int icon_x, int icon_y, WWindow * wwin, int animate)

8
src/workspace.c
View File

@@ -54,6 +54,7 @@
#define MAX_SHORTCUT_LENGTH 32
#define WORKSPACE_NAME_DISPLAY_PADDING 32
extern int ignore_wks_change;
extern WPreferences wPreferences;
extern XContext wWinContext;
extern XContext wVEdgeContext;
@@ -441,6 +442,13 @@ void wWorkspaceRelativeChange(WScreen * scr, int amount)
{
int w;
/* While the deiconify animation is going on the window is
* still "flying" to its final position and we don't want to
* change workspace before the animation finishes, otherwise
* the window will land in the new workspace */
if (ignore_wks_change)
return;
w = scr->current_workspace + amount;
if (amount < 0) {