Skip to content

Commit 9c6a4c8

Browse files
committed
Rely less on ShellClientsManager
1 parent bb56870 commit 9c6a4c8

File tree

4 files changed

+12
-20
lines changed

4 files changed

+12
-20
lines changed

src/DesktopIntegration.vala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ public class Gala.DesktopIntegration : GLib.Object {
7878
return false;
7979
}
8080

81-
if (ShellClientsManager.get_instance ().is_positioned_window (window)) {
82-
return false;
83-
}
84-
8581
switch (window.get_window_type ()) {
8682
case Meta.WindowType.NORMAL:
8783
case Meta.WindowType.DIALOG:

src/InternalUtils.vala

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,17 +210,19 @@ namespace Gala {
210210
});
211211

212212
foreach (var window in list) {
213-
if (!ShellClientsManager.get_instance ().is_positioned_window (window)) {
214-
if (any_window == null) {
215-
any_window = window;
216-
}
213+
if (window.find_root_ancestor ().window_type == DOCK) {
214+
continue;
215+
}
217216

218-
if (!Utils.get_window_is_normal (window)) {
219-
continue;
220-
}
217+
if (any_window == null) {
218+
any_window = window;
219+
}
221220

222-
return window;
221+
if (!Utils.get_window_is_normal (window)) {
222+
continue;
223223
}
224+
225+
return window;
224226
}
225227

226228
return null;

src/ShellClients/ShellWindow.vala

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,11 @@ public abstract class Gala.ShellWindow : PositionedWindow, GestureTarget {
7676
}
7777
}
7878

79-
unowned var manager = ShellClientsManager.get_instance ();
8079
window.foreach_transient ((transient) => {
81-
if (manager.is_itself_positioned (transient)) {
82-
return true;
80+
if (!Utils.get_window_is_normal (window)) {
81+
((Meta.WindowActor) transient.get_compositor_private ()).visible = visible && !animating;
8382
}
8483

85-
unowned var transient_window_actor = (Meta.WindowActor) transient.get_compositor_private ();
86-
87-
transient_window_actor.visible = visible && !animating;
88-
8984
return true;
9085
});
9186
}

src/WindowStateSaver.vala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public class Gala.WindowStateSaver : GLib.Object {
7979
var app_id = window_tracker.get_app_for_window (window).id;
8080

8181
if (app_id.has_prefix ("window:") || // if window failed to be identified, don't remember it
82-
ShellClientsManager.get_instance ().is_positioned_window (window) ||
8382
window.window_type != Meta.WindowType.NORMAL ||
8483
window.skip_taskbar ||
8584
!window.resizeable ||

0 commit comments

Comments
 (0)