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

Provide monitor to boxpointer alloc instead of finding it

Browse Source
This commit is contained in:
Charles Gagnon
2018-10-16 22:24:13 -04:00
parent 8c196838f2
commit 68719d0023
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
panelManager.js
View File

@@ -83,7 +83,7 @@ var dtpPanelManager = new Lang.Class({
let panelPosition = Taskbar.getPosition();
this.allPanels.forEach(p => {
p.panelBox.set_size(p.monitor.width, -1);
this._findPanelBoxPointers(p.panelBox).forEach(bp => this._adjustBoxPointer(bp, panelPosition));
this._findPanelBoxPointers(p.panelBox).forEach(bp => this._adjustBoxPointer(bp, p.monitor, panelPosition));
});
if (reset) return;
@@ -141,7 +141,7 @@ var dtpPanelManager = new Lang.Class({
);
['_leftBox', '_centerBox', '_rightBox'].forEach(c => this._signalsHandler.add(
[Main.panel[c], 'actor-added', (parent, child) => this._adjustBoxPointer(this._getPanelButtonBoxPointer(child), Taskbar.getPosition())]
[Main.panel[c], 'actor-added', (parent, child) => this._adjustBoxPointer(this._getPanelButtonBoxPointer(child), this.primaryPanel.monitor, Taskbar.getPosition())]
));
},
@@ -151,7 +151,7 @@ var dtpPanelManager = new Lang.Class({
this.allPanels.forEach(p => {
this._findPanelBoxPointers(p.panelBox).forEach(bp => {
bp._container.disconnect(bp._dtpAllocateId);
bp._container.disconnect(bp._dtpGetPreferredHeightId);
bp._userArrowSide = St.Side.TOP;
})
p.disable();
@@ -200,17 +200,15 @@ var dtpPanelManager = new Lang.Class({
this.enable(true);
},
_adjustBoxPointer: function(boxPointer, arrowSide) {
_adjustBoxPointer: function(boxPointer, monitor, arrowSide) {
if (boxPointer) {
boxPointer._userArrowSide = arrowSide;
boxPointer._dtpAllocateId = boxPointer._container.connect('allocate', (actor, box, flags) => {
boxPointer._dtpGetPreferredHeightId = boxPointer._container.connect('get-preferred-height', (actor, forWidth, alloc) => {
if (this._dtpSettings.get_boolean('intellihide')) {
let [width, height] = box.get_size();
let monitor = Main.layoutManager.findMonitorForActor(actor);
let excess = height + this._dtpSettings.get_int('panel-size') - monitor.height;
let excess = alloc.natural_size + this._dtpSettings.get_int('panel-size') + 20 - monitor.height; // 20 is arbitrary
if (excess > 0) {
actor.set_size(width, height - excess);
alloc.natural_size -= excess;
}
}
});