morgan/dash-to-panel
1
0
Fork 0
mirror of https://github.com/morgan9e/dash-to-panel synced 2026-04-14 00:04:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add multi-monitor support for older shell versions

Browse Source
This commit is contained in:
Charles Gagnon
2018-10-11 14:59:23 -04:00
parent ee59f48c48
commit ba4466463a
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
panel.js
View File

@@ -866,7 +866,7 @@ var dtpSecondaryAggregateMenu = new Lang.Class({
Name: 'dtpSecondaryAggregateMenu',
Extends: PanelMenu.Button,
_init() {
_init: function() {
this.parent(0.0, C_("System menu in the top bar", "System"), false);
this.menu.actor.add_style_class_name('aggregate-menu');
@@ -892,12 +892,22 @@ var dtpSecondaryAggregateMenu = new Lang.Class({
this._brightness = new imports.ui.status.brightness.Indicator();
this._system = new imports.ui.status.system.Indicator();
this._screencast = new imports.ui.status.screencast.Indicator();
this._nightLight = new imports.ui.status.nightLight.Indicator();
this._thunderbolt = new imports.ui.status.thunderbolt.Indicator();
if (Config.PACKAGE_VERSION >= '3.24') {
this._nightLight = new imports.ui.status.nightLight.Indicator();
}
this._indicators.add_child(this._thunderbolt.indicators);
if (Config.PACKAGE_VERSION >= '3.28') {
this._thunderbolt = new imports.ui.status.thunderbolt.Indicator();
}
if (this._thunderbolt) {
this._indicators.add_child(this._thunderbolt.indicators);
}
this._indicators.add_child(this._screencast.indicators);
this._indicators.add_child(this._nightLight.indicators);
if (this._nightLight) {
this._indicators.add_child(this._nightLight.indicators);
}
if (this._network) {
this._indicators.add_child(this._network.indicators);
}
@@ -918,7 +928,9 @@ var dtpSecondaryAggregateMenu = new Lang.Class({
this.menu.addMenuItem(this._bluetooth.menu);
}
this.menu.addMenuItem(this._power.menu);
this.menu.addMenuItem(this._nightLight.menu);
if (this._nightLight) {
this.menu.addMenuItem(this._nightLight.menu);
}
this.menu.addMenuItem(this._system.menu);
menuLayout.addSizeChild(this._power.menu.actor);

2
panelManager.js
View File

@@ -184,7 +184,7 @@ var dtpPanelManager = new Lang.Class({
// when it is next shown.
this.hide();
let workArea = Main.layoutManager.getWorkAreaForMonitor(this._focusedMonitor);
let workArea = Main.layoutManager.getWorkAreaForMonitor(this._focusedMonitor.index);
this._coverPane.set_position(0, workArea.y);
this._coverPane.set_size(workArea.width, workArea.height);