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

Merge pull request #405 from freeroot/dont_move_when_CENTEREDMONITOR

Browse Source 
don't move when CENTEREDMONITOR
This commit is contained in:
Jason DeRose
2018-05-11 08:29:33 -04:00
committed by GitHub
parent a9eed7e06e 027c8cdd4d
commit 4b2ff1dece
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
panel.js
View File

@@ -394,13 +394,21 @@ var dtpPanel = new Lang.Class({
childBox.x1 = 0;
childBox.x2 = sideWidth;
}
} else if (taskbarPosition == 'CENTEREDMONITOR' ) {
if (this.panel.actor.get_text_direction() == Clutter.TextDirection.RTL) {
childBox.x1 = allocWidth - Math.min(Math.floor(sideWidth), leftNaturalWidth);
childBox.x2 = allocWidth;
} else {
childBox.x1 = 0;
childBox.x2 = Math.min(Math.floor(sideWidth), leftNaturalWidth);
}
} else {
if (this.panel.actor.get_text_direction() == Clutter.TextDirection.RTL) {
childBox.x1 = allocWidth - leftNaturalWidth;
childBox.x2 = allocWidth;
} else {
childBox.x1 = 0;
childBox.x2 =leftNaturalWidth;
childBox.x2 = leftNaturalWidth;
}
}
this.panel._leftBox.allocate(childBox, flags, true);
@@ -415,6 +423,14 @@ var dtpPanel = new Lang.Class({
childBox.x1 = allocWidth - centerNaturalWidth - rightNaturalWidth;
childBox.x2 = childBox.x1 + centerNaturalWidth;
}
} else if (taskbarPosition == 'CENTEREDMONITOR' ) {
if (this.panel.actor.get_text_direction() == Clutter.TextDirection.RTL) {
childBox.x1 = Math.ceil(sideWidth);
childBox.x2 = childBox.x1 + centerNaturalWidth;
} else {
childBox.x1 = allocWidth - centerNaturalWidth - Math.ceil(sideWidth);
childBox.x2 = childBox.x1 + centerNaturalWidth;
}
} else {
if (this.panel.actor.get_text_direction() == Clutter.TextDirection.RTL) {
childBox.x1 = Math.max(rightNaturalWidth, rightSideWidth);