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

Consider panelBox padding in allocation

Browse Source
This commit is contained in:
Charles Gagnon
2020-05-17 11:41:45 -04:00
parent f907ccca4a
commit ec63802ac8
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
panel.js
View File

@@ -856,10 +856,9 @@ var dtpPanel = Utils.defineClass({
vfunc_allocate: function(box, flags) {
this.set_allocation(box, flags);
this.panel.actor.allocate(new Clutter.ActorBox({ x1: 0, y1: 0, x2: this.geom.w, y2: this.geom.h }), flags);
let fixed = 0;
let centeredMonitorGroup;
let panelAlloc = new Clutter.ActorBox({ x1: 0, y1: 0, x2: this.geom.w, y2: this.geom.h });
let assignGroupSize = (group, update) => {
group.size = 0;
group.tlOffset = 0;
@@ -867,8 +866,8 @@ var dtpPanel = Utils.defineClass({
group.elements.forEach(element => {
if (!update) {
element.box[fixedCoord.c1] = box[fixedCoord.c1];
element.box[fixedCoord.c2] = box[fixedCoord.c2];
element.box[fixedCoord.c1] = panelAlloc[fixedCoord.c1];
element.box[fixedCoord.c2] = panelAlloc[fixedCoord.c2];
element.natSize = element.actor[sizeFunc](-1)[1];
}
@@ -955,6 +954,8 @@ var dtpPanel = Utils.defineClass({
++fixed;
};
this.panel.actor.allocate(panelAlloc, flags);
this._elementGroups.forEach(group => {
group.fixed = 0;
@@ -966,7 +967,7 @@ var dtpPanel = Utils.defineClass({
});
if (centeredMonitorGroup) {
allocateGroup(centeredMonitorGroup, box[varCoord.c1], box[varCoord.c2]);
allocateGroup(centeredMonitorGroup, panelAlloc[varCoord.c1], panelAlloc[varCoord.c2]);
}
let iterations = 0; //failsafe
@@ -980,13 +981,13 @@ var dtpPanel = Utils.defineClass({
let prevGroup = this._elementGroups[i - 1];
let nextGroup = this._elementGroups[i + 1];
let prevLimit = prevGroup && prevGroup.fixed ? prevGroup[varCoord.c2] : box[varCoord.c1];
let nextLimit = nextGroup && nextGroup.fixed ? nextGroup[varCoord.c1] : box[varCoord.c2];
let prevLimit = prevGroup && prevGroup.fixed ? prevGroup[varCoord.c2] : panelAlloc[varCoord.c1];
let nextLimit = nextGroup && nextGroup.fixed ? nextGroup[varCoord.c1] : panelAlloc[varCoord.c2];
if (group.position == Pos.STACKED_TL) {
allocateGroup(group, box[varCoord.c1], nextLimit);
allocateGroup(group, panelAlloc[varCoord.c1], nextLimit);
} else if (group.position == Pos.STACKED_BR) {
allocateGroup(group, prevLimit, box[varCoord.c2]);
allocateGroup(group, prevLimit, panelAlloc[varCoord.c2]);
} else if ((!prevGroup || prevGroup.fixed) && (!nextGroup || nextGroup.fixed)) { // CENTERED
allocateGroup(group, prevLimit, nextLimit);
}

2
panelPositions.js
View File

@@ -33,7 +33,7 @@ var CENTERED_MONITOR = 'centerMonitor';
var defaults = [
{ element: SHOW_APPS_BTN, visible: true, position: STACKED_TL },
{ element: ACTIVITIES_BTN, visible: false, position: STACKED_TL },
{ element: LEFT_BOX, visible: false, position: STACKED_TL },
{ element: LEFT_BOX, visible: true, position: STACKED_TL },
{ element: TASKBAR, visible: true, position: STACKED_TL },
{ element: CENTER_BOX, visible: true, position: STACKED_BR },
{ element: RIGHT_BOX, visible: true, position: STACKED_BR },