Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get MonitorManager from context #1604

Merged
merged 1 commit into from
Apr 1, 2023
Merged

Get MonitorManager from context #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/maskcorners/Main.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class Gala.Plugins.MaskCorners.Main : Gala.Plugin {
display.in_fullscreen_changed.connect (fullscreen_changed);
}

unowned Meta.MonitorManager monitor_manager = Meta.MonitorManager.@get ();
unowned Meta.MonitorManager monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.connect (resetup_cornermasks);

display.gl_video_memory_purged.connect (resetup_cornermasks);
Expand All @@ -71,7 +71,7 @@ public class Gala.Plugins.MaskCorners.Main : Gala.Plugin {
private void destroy_cornermasks () {
display.gl_video_memory_purged.disconnect (resetup_cornermasks);

unowned Meta.MonitorManager monitor_manager = Meta.MonitorManager.@get ();
unowned Meta.MonitorManager monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.disconnect (resetup_cornermasks);
display.in_fullscreen_changed.disconnect (fullscreen_changed);

Expand Down
6 changes: 4 additions & 2 deletions src/Background/BackgroundContainer.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ namespace Gala {
}

construct {
Meta.MonitorManager.@get ().monitors_changed.connect (update);
unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.connect (update);

reactive = true;
button_release_event.connect ((event) => {
Expand All @@ -40,7 +41,8 @@ namespace Gala {
}

~BackgroundContainer () {
Meta.MonitorManager.@get ().monitors_changed.disconnect (update);
unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.disconnect (update);
}

private void update () {
Expand Down
6 changes: 4 additions & 2 deletions src/Background/BackgroundSource.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ namespace Gala {
backgrounds = new Gee.HashMap<int,Background> ();
hash_cache = new uint[OPTIONS.length];

Meta.MonitorManager.@get ().monitors_changed.connect (monitors_changed);
unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.connect (monitors_changed);

// unfortunately the settings sometimes tend to fire random changes even though
// nothing actually happened. The code below is used to prevent us from spamming
Expand Down Expand Up @@ -120,7 +121,8 @@ namespace Gala {
}

public void destroy () {
Meta.MonitorManager.@get ().monitors_changed.disconnect (monitors_changed);
unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.disconnect (monitors_changed);

foreach (var background in backgrounds.values) {
background.changed.disconnect (background_changed);
Expand Down
3 changes: 2 additions & 1 deletion src/HotCorners/HotCornerManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ public class Gala.HotCornerManager : Object {

hot_corners = new GLib.GenericArray<HotCorner> ();
behavior_settings.changed.connect (configure);
Meta.MonitorManager.@get ().monitors_changed.connect (configure);
unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.connect (configure);
}

public void configure () {
Expand Down
3 changes: 2 additions & 1 deletion src/NotificationStack.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ public class Gala.NotificationStack : Object {
construct {
notifications = new Gee.ArrayList<unowned Meta.WindowActor> ();

Meta.MonitorManager.@get ().monitors_changed_internal.connect (update_stack_allocation);
unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed_internal.connect (update_stack_allocation);
display.workareas_changed.connect (update_stack_allocation);
update_stack_allocation ();
}
Expand Down
3 changes: 2 additions & 1 deletion src/Widgets/MultitaskingView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ namespace Gala {

window_containers_monitors = new List<MonitorClone> ();
update_monitors ();
Meta.MonitorManager.@get ().monitors_changed.connect (update_monitors);
unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.connect (update_monitors);

Meta.Prefs.add_listener ((pref) => {
if (pref == Meta.Preference.WORKSPACES_ONLY_ON_PRIMARY) {
Expand Down
3 changes: 2 additions & 1 deletion src/Widgets/PointerLocator.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ namespace Gala {
pivot.init (0.5f, 0.5f);
pivot_point = pivot;

Meta.MonitorManager.@get ().monitors_changed.connect (update_surface);
unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.connect (update_surface);
}

private void update_surface () {
Expand Down
3 changes: 2 additions & 1 deletion src/Widgets/WindowSwitcher.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ namespace Gala {
create_components ();
});

Meta.MonitorManager.@get ().monitors_changed.connect (() => {
unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.connect (() => {
var cur_scale = InternalUtils.get_ui_scaling_factor ();
if (cur_scale != scaling_factor) {
scaling_factor = cur_scale;
Expand Down
5 changes: 3 additions & 2 deletions src/WindowManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,8 @@ namespace Gala {
var shadow_settings = new GLib.Settings (Config.SCHEMA + ".shadows");
shadow_settings.changed.connect (InternalUtils.reload_shadow);

Meta.MonitorManager.@get ().monitors_changed.connect (on_monitors_changed);
unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.connect (on_monitors_changed);

hot_corner_manager = new HotCornerManager (this, behavior_settings);
hot_corner_manager.on_configured.connect (update_input_area);
Expand Down Expand Up @@ -359,7 +360,7 @@ namespace Gala {
update_input_area ();

// while a workspace is being switched mutter doesn't map windows
// TODO: currently only notifications are handled here, other windows should be too
// TODO: currently only notifications are handled here, other windows should be too
display.window_created.connect ((window) => {
if (!animating_switch_workspace) {
return;
Expand Down