nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix problems with conflicing interactive desktop switching and send-to-ing

Browse source
This commit is contained in:
Dana Jansens 2003-09-24 06:29:09 +00:00
parent cc19a55f0e
commit 89286cbe83
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
openbox/action.c
View file

@ -1195,7 +1195,11 @@ void action_desktop_dir(union ActionData *data)
data->desktopdir.inter.any.interactive, data->desktopdir.inter.any.interactive,
data->desktopdir.inter.final, data->desktopdir.inter.final,
data->desktopdir.inter.cancel); data->desktopdir.inter.cancel);
screen_set_desktop(d); if (!data->sendtodir.inter.any.interactive ||
!data->sendtodir.inter.final)
{
screen_set_desktop(d);
}
} }
void action_send_to_desktop_dir(union ActionData *data) void action_send_to_desktop_dir(union ActionData *data)
@ -1210,9 +1214,13 @@ void action_send_to_desktop_dir(union ActionData *data)
data->sendtodir.inter.any.interactive, data->sendtodir.inter.any.interactive,
data->sendtodir.inter.final, data->sendtodir.inter.final,
data->sendtodir.inter.cancel); data->sendtodir.inter.cancel);
client_set_desktop(c, d, data->sendtodir.follow); if (!data->sendtodir.inter.any.interactive ||
if (data->sendtodir.follow) !data->sendtodir.inter.final)
screen_set_desktop(d); {
client_set_desktop(c, d, data->sendtodir.follow);
if (data->sendtodir.follow)
screen_set_desktop(d);
}
} }
void action_desktop_last(union ActionData *data) void action_desktop_last(union ActionData *data)