BreizhHardware/multi-monitors-add-on
1
0
Fork 0
mirror of https://github.com/BreizhHardware/multi-monitors-add-on.git synced 2026-01-18 16:47:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

#64 Honor 'enable-hot-corners' option for Ubuntu.

Browse Source
This commit is contained in:
spin83
2018-05-12 17:34:13 +02:00
parent 15d4e9c064
commit acdba47e0e
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
multi-monitors-add-on@spin83/mmlayout.js
View File

@@ -11,6 +11,8 @@ const Main = imports.ui.main;
const Panel = imports.ui.panel;
const Layout = imports.ui.layout;
const Config = imports.misc.config;
const ExtensionUtils = imports.misc.extensionUtils;
const MultiMonitors = ExtensionUtils.getCurrentExtension();
const Convenience = MultiMonitors.imports.convenience;
@@ -68,7 +70,8 @@ const MultiMonitorsPanelBox = new Lang.Class({
var MultiMonitorsLayoutManager = new Lang.Class({
Name: 'MultiMonitorsLayoutManager',
_init: function () {
this._currentVersion = Config.PACKAGE_VERSION.split('.');
this._settings = Convenience.getSettings();
Main.mmPanel = [];
@@ -82,6 +85,7 @@ var MultiMonitorsLayoutManager = new Lang.Class({
this.statusIndicatorsController = null;
this._layoutManager_updateHotCorners = null;
this._changedEnableHotCornersId = null;
},
showPanel: function() {
@@ -100,13 +104,22 @@ var MultiMonitorsLayoutManager = new Lang.Class({
if (!this._layoutManager_updateHotCorners) {
this._layoutManager_updateHotCorners = Main.layoutManager['_updateHotCorners'];
let enable_hot_corners = (Main.sessionMode.currentMode == 'ubuntu' && this._currentVersion[0]==3 && this._currentVersion[1]==28);
Main.layoutManager['_updateHotCorners'] = function() {
this.hotCorners.forEach(function(corner) {
if (corner)
corner.destroy();
});
this.hotCorners = [];
if (enable_hot_corners) {
if (!global.settings.get_boolean('enable-hot-corners')) {
this.emit('hot-corners-changed');
return;
}
}
let size = this.panelBox.height;
for (let i = 0; i < this.monitors.length; i++) {
@@ -121,6 +134,14 @@ var MultiMonitorsLayoutManager = new Lang.Class({
this.emit('hot-corners-changed');
};
if (!this._changedEnableHotCornersId) {
if (enable_hot_corners) {
this._changedEnableHotCornersId = global.settings.connect('changed::enable-hot-corners',
Main.layoutManager._updateHotCorners.bind(Main.layoutManager));
}
}
Main.layoutManager._updateHotCorners();
}
}
@@ -130,6 +151,11 @@ var MultiMonitorsLayoutManager = new Lang.Class({
},
hidePanel: function() {
if (this._changedEnableHotCornersId) {
global.settings.disconnect(this._changedEnableHotCornersId);
this._changedEnableHotCornersId = null;
}
if (this._layoutManager_updateHotCorners) {
Main.layoutManager['_updateHotCorners'] = this._layoutManager_updateHotCorners;
this._layoutManager_updateHotCorners = null;
@@ -249,4 +275,4 @@ var MultiMonitorsLayoutManager = new Lang.Class({
}
},
});