Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/Misc/WindowListener.vala
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public class Gala.WindowListener : Object {
}

public signal void window_workspace_changed (Meta.Window window);
public signal void window_on_all_workspaces_changed (Meta.Window window);
public signal void window_maximized_changed (Meta.Window window) {
WindowGeometry window_geometry = {};
window_geometry.inner = window.get_frame_rect ();
Expand Down Expand Up @@ -87,9 +86,6 @@ public class Gala.WindowListener : Object {
case "maximized-vertically":
window_maximized_changed (window);
break;
case "on-all-workspaces":
window_on_all_workspaces_changed (window);
break;
case "fullscreen":
window_fullscreen_changed (window);
break;
Expand Down
16 changes: 3 additions & 13 deletions src/Widgets/MultitaskingView/StaticWindowContainer.vala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

/**
* Holds clones of static windows (e.g. on all workspaces or being moved)
* Holds clones of static windows (e.g. grabbed or being moved)
* in the multitasking view and fades them out while opening the multitasking view.
* The window container use this to know whether a window became static (they shouldn't show it anymore)
* or isn't static anymore (they have to show it now).
Expand All @@ -29,8 +29,6 @@ public class Gala.StaticWindowContainer : Widget {
construct {
display.grab_op_begin.connect (on_grab_op_begin);
display.grab_op_end.connect (on_grab_op_end);

WindowListener.get_default ().window_on_all_workspaces_changed.connect (on_all_workspaces_changed);
}

private void on_grab_op_begin (Meta.Window window, Meta.GrabOp op) {
Expand All @@ -47,14 +45,6 @@ public class Gala.StaticWindowContainer : Widget {
check_window_changed (window);
}

private void on_all_workspaces_changed (Meta.Window window) {
// We have to wait for shell clients here
Idle.add (() => {
check_window_changed (window);
return Source.REMOVE;
});
}

public void notify_window_moving (Meta.Window window) {
moving_window = window;
check_window_changed (window);
Expand Down Expand Up @@ -83,14 +73,14 @@ public class Gala.StaticWindowContainer : Widget {

if (!is_static && clone != null) {
remove_child (clone);
} else if (is_static && !window.on_all_workspaces && clone == null) {
} else if (is_static && clone == null) {
add_child (new StaticWindowClone (window));
}

window_changed (window, is_static);
}

public bool is_static (Meta.Window window) {
return window == grabbed_window || window == moving_window || window.on_all_workspaces;
return window == grabbed_window || window == moving_window;
}
}