brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

magnifier: Only connect to signals when ZoomRegion is active

Browse Source 
There's no need to listen signals when the zoom region is inactive, so let's
just connect/disconnect them.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/472
This commit is contained in:
Marco Trevisan (Treviño) 2019-03-27 22:57:33 +01:00
parent a298943fac
commit 3e0915521a
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/ui/magnifier.js
View File

@ -754,13 +754,29 @@ var ZoomRegion = class ZoomRegion {
this._pointerIdleMonitor = Meta.IdleMonitor.get_for_device(Meta.VIRTUAL_CORE_POINTER_ID); this._pointerIdleMonitor = Meta.IdleMonitor.get_for_device(Meta.VIRTUAL_CORE_POINTER_ID);
this._scrollContentsTimerId = 0; this._scrollContentsTimerId = 0;
}
Main.layoutManager.connect('monitors-changed', _connectSignals() {
this._monitorsChanged.bind(this)); if (this._signalConnections)
this._focusCaretTracker.connect('caret-moved', return;
this._updateCaret.bind(this));
this._focusCaretTracker.connect('focus-changed', this._signalConnections = [];
this._updateFocus.bind(this)); let id = Main.layoutManager.connect('monitors-changed',
this._monitorsChanged.bind(this));
this._signalConnections.push([Main.layoutManager, id]);
id = this._focusCaretTracker.connect('caret-moved', this._updateCaret.bind(this));
this._signalConnections.push([this._focusCaretTracker, id]);
id = this._focusCaretTracker.connect('focus-changed', this._updateFocus.bind(this));
this._signalConnections.push([this._focusCaretTracker, id]);
}
_disconnectSignals() {
for (let [obj, id] of this._signalConnections)
obj.disconnect(id);
delete this._signalConnections;
} }
_updateScreenPosition() { _updateScreenPosition() {
@ -824,7 +840,9 @@ var ZoomRegion = class ZoomRegion {
this._updateMagViewGeometry(); this._updateMagViewGeometry();
this._updateCloneGeometry(); this._updateCloneGeometry();
this._updateMousePosition(); this._updateMousePosition();
this._connectSignals();
} else { } else {
this._disconnectSignals();
this._destroyActors(); this._destroyActors();
} }
@ -1574,9 +1592,6 @@ var ZoomRegion = class ZoomRegion {
} }
_monitorsChanged() { _monitorsChanged() {
if (!this.isActive())
return;
this._background.set_size(global.screen_width, global.screen_height); this._background.set_size(global.screen_width, global.screen_height);
this._updateScreenPosition(); this._updateScreenPosition();
} }