From c1d66af4b9827947b596fba2f4dd4424874a2f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 7 Sep 2022 20:24:44 +0200 Subject: [PATCH] js: Get monitor manager from backend Part-of: --- js/misc/introspect.js | 2 +- js/misc/systemActions.js | 4 ++-- js/ui/background.js | 4 ++-- js/ui/layout.js | 2 +- js/ui/osdMonitorLabeler.js | 2 +- js/ui/shellDBus.js | 2 +- js/ui/switchMonitor.js | 4 ++-- js/ui/unlockDialog.js | 4 ++-- js/ui/windowManager.js | 3 ++- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/js/misc/introspect.js b/js/misc/introspect.js index 8916804e7..dcb158f0e 100644 --- a/js/misc/introspect.js +++ b/js/misc/introspect.js @@ -54,7 +54,7 @@ var IntrospectService = class { this._syncAnimationsEnabled.bind(this)); this._syncAnimationsEnabled(); - const monitorManager = Meta.MonitorManager.get(); + const monitorManager = global.backend.get_monitor_manager(); monitorManager.connect('monitors-changed', this._syncScreenSize.bind(this)); this._syncScreenSize(); diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js index 591160c84..759862a44 100644 --- a/js/misc/systemActions.js +++ b/js/misc/systemActions.js @@ -1,5 +1,5 @@ /* exported getDefault */ -const { AccountsService, Clutter, Gdm, Gio, GLib, GObject, Meta } = imports.gi; +const {AccountsService, Clutter, Gdm, Gio, GLib, GObject} = imports.gi; const GnomeSession = imports.misc.gnomeSession; const LoginManager = imports.misc.loginManager; @@ -149,7 +149,7 @@ const SystemActions = GObject.registerClass({ this._session = new GnomeSession.SessionManager(); this._loginManager = LoginManager.getLoginManager(); - this._monitorManager = Meta.MonitorManager.get(); + this._monitorManager = global.backend.get_monitor_manager(); this._userManager = AccountsService.UserManager.get_default(); diff --git a/js/ui/background.js b/js/ui/background.js index 829ffb42b..023b1823e 100644 --- a/js/ui/background.js +++ b/js/ui/background.js @@ -555,7 +555,7 @@ var BackgroundSource = class BackgroundSource { this._settings = new Gio.Settings({ schema_id: settingsSchema }); this._backgrounds = []; - let monitorManager = Meta.MonitorManager.get(); + const monitorManager = global.backend.get_monitor_manager(); this._monitorsChangedId = monitorManager.connect('monitors-changed', this._onMonitorsChanged.bind(this)); @@ -630,7 +630,7 @@ var BackgroundSource = class BackgroundSource { } destroy() { - let monitorManager = Meta.MonitorManager.get(); + const monitorManager = global.backend.get_monitor_manager(); monitorManager.disconnect(this._monitorsChangedId); for (let monitorIndex in this._backgrounds) { diff --git a/js/ui/layout.js b/js/ui/layout.js index b6c8f4f58..6b9deeaa3 100644 --- a/js/ui/layout.js +++ b/js/ui/layout.js @@ -329,7 +329,7 @@ var LayoutManager = GObject.registerClass({ display.connect('in-fullscreen-changed', this._updateFullscreen.bind(this)); - let monitorManager = Meta.MonitorManager.get(); + const monitorManager = global.backend.get_monitor_manager(); monitorManager.connect('monitors-changed', this._monitorsChanged.bind(this)); this._monitorsChanged(); diff --git a/js/ui/osdMonitorLabeler.js b/js/ui/osdMonitorLabeler.js index 07c7d6569..31d99c140 100644 --- a/js/ui/osdMonitorLabeler.js +++ b/js/ui/osdMonitorLabeler.js @@ -47,7 +47,7 @@ class OsdMonitorLabel extends St.Widget { var OsdMonitorLabeler = class { constructor() { - this._monitorManager = Meta.MonitorManager.get(); + this._monitorManager = global.backend.get_monitor_manager(); this._client = null; this._clientWatchId = 0; this._osdLabels = []; diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js index 284d92b0b..0b458316a 100644 --- a/js/ui/shellDBus.js +++ b/js/ui/shellDBus.js @@ -127,7 +127,7 @@ var GnomeShell = class { let monitorIndex = -1; if (connector) { - let monitorManager = Meta.MonitorManager.get(); + const monitorManager = global.backend.get_monitor_manager(); monitorIndex = monitorManager.get_monitor_for_connector(connector); } diff --git a/js/ui/switchMonitor.js b/js/ui/switchMonitor.js index a95c5fa9a..4e00eb3c0 100644 --- a/js/ui/switchMonitor.js +++ b/js/ui/switchMonitor.js @@ -55,14 +55,14 @@ class SwitchMonitorPopup extends SwitcherPopup.SwitcherPopup { } show(backward, binding, mask) { - if (!Meta.MonitorManager.get().can_switch_config()) + if (!global.backend.get_monitor_manager().can_switch_config()) return false; return super.show(backward, binding, mask); } _initialSelection() { - let currentConfig = Meta.MonitorManager.get().get_switch_config(); + let currentConfig = global.backend.get_monitor_manager().get_switch_config(); let selectConfig = (currentConfig + 1) % this._items.length; this._select(selectConfig); } diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js index 24c81609c..3f353c743 100644 --- a/js/ui/unlockDialog.js +++ b/js/ui/unlockDialog.js @@ -3,7 +3,7 @@ const { AccountsService, Atk, Clutter, Gdm, Gio, - GnomeDesktop, GLib, GObject, Meta, Shell, St, + GnomeDesktop, GLib, GObject, Shell, St, } = imports.gi; const Background = imports.ui.background; @@ -337,7 +337,7 @@ class UnlockDialogClock extends St.BoxLayout { this._seat.connectObject('notify::touch-mode', this._updateHint.bind(this), this); - this._monitorManager = Meta.MonitorManager.get(); + this._monitorManager = global.backend.get_monitor_manager(); this._monitorManager.connectObject('power-save-mode-changed', () => (this._hint.opacity = 0), this); diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js index c0a1dca07..c99215a7a 100644 --- a/js/ui/windowManager.js +++ b/js/ui/windowManager.js @@ -56,7 +56,8 @@ class DisplayChangeDialog extends ModalDialog.ModalDialog { this._wm = wm; - this._countDown = Meta.MonitorManager.get_display_configuration_timeout(); + const monitorManager = global.backend.get_monitor_manager(); + this._countDown = monitorManager.get_display_configuration_timeout(); // Translators: This string should be shorter than 30 characters let title = _('Keep these display settings?');