fix problems with conflicing interactive desktop switching and send-to-ing
This commit is contained in:
parent
cc19a55f0e
commit
89286cbe83
1 changed files with 12 additions and 4 deletions
|
@ -1195,7 +1195,11 @@ void action_desktop_dir(union ActionData *data)
|
|||
data->desktopdir.inter.any.interactive,
|
||||
data->desktopdir.inter.final,
|
||||
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)
|
||||
|
@ -1210,9 +1214,13 @@ void action_send_to_desktop_dir(union ActionData *data)
|
|||
data->sendtodir.inter.any.interactive,
|
||||
data->sendtodir.inter.final,
|
||||
data->sendtodir.inter.cancel);
|
||||
client_set_desktop(c, d, data->sendtodir.follow);
|
||||
if (data->sendtodir.follow)
|
||||
screen_set_desktop(d);
|
||||
if (!data->sendtodir.inter.any.interactive ||
|
||||
!data->sendtodir.inter.final)
|
||||
{
|
||||
client_set_desktop(c, d, data->sendtodir.follow);
|
||||
if (data->sendtodir.follow)
|
||||
screen_set_desktop(d);
|
||||
}
|
||||
}
|
||||
|
||||
void action_desktop_last(union ActionData *data)
|
||||
|
|
Loading…
Reference in a new issue