dont move windows away from omnpresentness when deiconifying them

This commit is contained in:
Dana Jansens 2007-05-04 07:19:21 +00:00
parent e84fb1b052
commit a823e4786e

View file

@ -2611,7 +2611,8 @@ static void client_iconify_recursive(ObClient *self,
} else { } else {
self->iconic = iconic; self->iconic = iconic;
if (curdesk) if (curdesk && self->desktop != screen_desktop &&
self->desktop != DESKTOP_ALL)
client_set_desktop(self, screen_desktop, FALSE); client_set_desktop(self, screen_desktop, FALSE);
/* this puts it after the current focused window */ /* this puts it after the current focused window */
@ -3182,7 +3183,8 @@ void client_activate(ObClient *self, gboolean here, gboolean user)
if (self->iconic) if (self->iconic)
client_iconify(self, FALSE, here); client_iconify(self, FALSE, here);
if (self->desktop != DESKTOP_ALL && if (self->desktop != DESKTOP_ALL &&
self->desktop != screen_desktop) { self->desktop != screen_desktop)
{
if (here) if (here)
client_set_desktop(self, screen_desktop, FALSE); client_set_desktop(self, screen_desktop, FALSE);
else else