elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-09-11 15:15:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use Meta.Window.is_on_primary_monitor () (#1731)

Browse Source
This commit is contained in:
Leo 2023-07-20 15:36:21 +09:00 committed by GitHub
parent eef351e5df
commit b4a6a04d72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Widgets/WindowClone.vala
View File

@ -677,7 +677,7 @@ public class Gala.WindowClone : Clutter.Actor {
// for an icon group, we only do animations if there is an actual movement possible // for an icon group, we only do animations if there is an actual movement possible
if (icon_group != null if (icon_group != null
&& icon_group.workspace == window.get_workspace () && icon_group.workspace == window.get_workspace ()
&& window.get_monitor () == window.get_display ().get_primary_monitor ()) { && window.is_on_primary_monitor ()) {
return; return;
} }
@ -733,7 +733,7 @@ public class Gala.WindowClone : Clutter.Actor {
var will_move = window.get_workspace ().index () != inserter.workspace_index; var will_move = window.get_workspace ().index () != inserter.workspace_index;
if (Meta.Prefs.get_workspaces_only_on_primary () && window.get_monitor () != primary) { if (Meta.Prefs.get_workspaces_only_on_primary () && !window.is_on_primary_monitor ()) {
window.move_to_monitor (primary); window.move_to_monitor (primary);
will_move = true; will_move = true;
} }
@ -763,7 +763,7 @@ public class Gala.WindowClone : Clutter.Actor {
bool did_move = false; bool did_move = false;
if (Meta.Prefs.get_workspaces_only_on_primary () && window.get_monitor () != primary) { if (Meta.Prefs.get_workspaces_only_on_primary () && !window.is_on_primary_monitor ()) {
window.move_to_monitor (primary); window.move_to_monitor (primary);
did_move = true; did_move = true;
} }

4
src/Widgets/WorkspaceClone.vala
View File

@ -219,7 +219,7 @@ namespace Gala {
foreach (var window in windows) { foreach (var window in windows) {
if (window.window_type == Meta.WindowType.NORMAL if (window.window_type == Meta.WindowType.NORMAL
&& !window.on_all_workspaces && !window.on_all_workspaces
&& window.get_monitor () == display.get_primary_monitor ()) { && window.is_on_primary_monitor ()) {
window_container.add_window (window); window_container.add_window (window);
icon_group.add_window (window, true); icon_group.add_window (window, true);
} }
@ -256,7 +256,7 @@ namespace Gala {
if (window.window_type != Meta.WindowType.NORMAL if (window.window_type != Meta.WindowType.NORMAL
|| window.get_workspace () != workspace || window.get_workspace () != workspace
|| window.on_all_workspaces || window.on_all_workspaces
|| window.get_monitor () != window.get_display ().get_primary_monitor ()) || !window.is_on_primary_monitor ())
return; return;
foreach (var child in window_container.get_children ()) foreach (var child in window_container.get_children ())

2
src/WindowManager.vala
View File

@ -1896,7 +1896,7 @@ namespace Gala {
unowned Meta.Window window = actor.get_meta_window (); unowned Meta.Window window = actor.get_meta_window ();
if (!window.showing_on_its_workspace () || if (!window.showing_on_its_workspace () ||
(move_primary_only && window.get_monitor () != primary) || (move_primary_only && !window.is_on_primary_monitor ()) ||
(moving != null && window == moving)) (moving != null && window == moving))
continue; continue;