mirror of
https://github.com/elementary/gala.git
synced 2024-09-11 15:15:39 +03:00
Kill workspace switch when opening multitasking view (#1735)
Co-authored-by: Ryan Kornheisl <ryan@skarva.tech>
This commit is contained in:
parent
20ccf8b174
commit
a0b3025f3c
@ -652,6 +652,11 @@ namespace Gala {
|
|||||||
opened = !opened;
|
opened = !opened;
|
||||||
var opening = opened;
|
var opening = opened;
|
||||||
|
|
||||||
|
// https://github.com/elementary/gala/issues/1728
|
||||||
|
if (opening) {
|
||||||
|
wm.kill_switch_workspace ();
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var container in window_containers_monitors) {
|
foreach (var container in window_containers_monitors) {
|
||||||
if (opening) {
|
if (opening) {
|
||||||
container.visible = true;
|
container.visible = true;
|
||||||
|
@ -2081,7 +2081,6 @@ namespace Gala {
|
|||||||
switch_workspace_window_created_id = 0;
|
switch_workspace_window_created_id = 0;
|
||||||
}
|
}
|
||||||
end_switch_workspace ();
|
end_switch_workspace ();
|
||||||
switch_workspace_with_gesture = false;
|
|
||||||
animating_switch_workspace = cancel_action;
|
animating_switch_workspace = cancel_action;
|
||||||
|
|
||||||
if (cancel_action) {
|
if (cancel_action) {
|
||||||
@ -2154,6 +2153,9 @@ namespace Gala {
|
|||||||
parents = null;
|
parents = null;
|
||||||
moving = null;
|
moving = null;
|
||||||
|
|
||||||
|
switch_workspace_with_gesture = false;
|
||||||
|
animating_switch_workspace = false;
|
||||||
|
|
||||||
switch_workspace_completed ();
|
switch_workspace_completed ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user