vhad/PaperWM
1
0
Fork 0
mirror of https://github.com/gosticks/PaperWM.git synced 2026-10-06 11:56:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use monitor's workarea to position windows

Browse Source 
ref #94
This commit is contained in:
Tor Hedin Brønner
2019-02-12 09:15:05 +01:00
parent 09950f20a2
commit 70ffca17a5
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tiling.js
+24 -20
View File
@@ -1964,29 +1964,32 @@ function ensureViewport(meta_window, space, force) {
let x = Math.round(clone.targetX) + space.targetX;
let y = panelBox.height + prefs.vertical_margin;
let gap = prefs.window_gap;
if (index == 0 && x <= 0) {
let workArea = Main.layoutManager.getWorkAreaForMonitor(monitor.index);
let min = workArea.x - monitor.x;
let max = min + workArea.width;
if (index == 0 && x <= min) {
// Always align the first window to the display's left edge
x = 0;
} else if (index == space.length-1 && x + frame.width >= space.width) {
x = min;
} else if (index == space.length-1 && x + frame.width >= max) {
// Always align the first window to the display's right edge
x = space.width - frame.width;
} else if (frame.width > space.width*0.9 - 2*(prefs.horizontal_margin + prefs.window_gap)) {
x = max - frame.width;
} else if (frame.width > workArea.width*0.9 - 2*(prefs.horizontal_margin + prefs.window_gap)) {
// Consider the window to be wide and center it
x = Math.round((space.width - frame.width)/2);
x = min + Math.round((workArea.width - frame.width)/2);
} else if (x + frame.width > space.width) {
} else if (x + frame.width > max) {
// Align to the right prefs.horizontal_margin
x = space.width - prefs.horizontal_margin - frame.width;
} else if (x < 0) {
x = max - prefs.horizontal_margin - frame.width;
} else if (x < min) {
// Align to the left prefs.horizontal_margin
x = prefs.horizontal_margin;
} else if (x + frame.width === space.width) {
x = min + prefs.horizontal_margin;
} else if (x + frame.width === max) {
// When opening new windows at the end, in the background, we want to
// show some minimup margin
x = space.width - minimumMargin - frame.width;
} else if (x === 0) {
x = max - minimumMargin - frame.width;
} else if (x === min) {
// Same for the start (though the case isn't as common)
x = minimumMargin;
x = min + minimumMargin;
}
@@ -2243,9 +2246,9 @@ function isWindowAnimating(metaWindow) {
function toggleMaximizeHorizontally(metaWindow) {
metaWindow = metaWindow || display.focus_window;
let monitor = Main.layoutManager.monitors[metaWindow.get_monitor()];
let workArea = Main.layoutManager.getWorkAreaForMonitor(metaWindow.get_monitor());
let frame = metaWindow.get_frame_rect();
let reqWidth = monitor.width - minimumMargin*2;
let reqWidth = workArea.width - minimumMargin*2;
// Some windows only resize in increments > 1px so we can't rely on a precise width
// Hopefully this heuristic is good enough
@@ -2259,9 +2262,9 @@ function toggleMaximizeHorizontally(metaWindow) {
metaWindow.unmaximizedRect = null;
} else {
let x = monitor.x + minimumMargin;
let x = workArea.x + minimumMargin;
metaWindow.unmaximizedRect = frame;
metaWindow.move_resize_frame(true, x, frame.y, monitor.width - minimumMargin*2, frame.height);
metaWindow.move_resize_frame(true, x, frame.y, workArea.width - minimumMargin*2, frame.height);
}
}
@@ -2285,15 +2288,16 @@ function cycleWindowWidth(metaWindow) {
}
let frame = metaWindow.get_frame_rect();
let monitor = Main.layoutManager.monitors[metaWindow.get_monitor()];
let workArea = Main.layoutManager.getWorkAreaForMonitor(metaWindow.get_monitor());
// Make sure two windows of "compatible" width will have room
let availableWidth = monitor.width - prefs.horizontal_margin*2 - prefs.window_gap;
let availableWidth = workArea.width - prefs.horizontal_margin*2 - prefs.window_gap;
let r = frame.width / availableWidth;
let nextW = Math.floor(ratios[findNext(r)]*availableWidth);
let nextX = frame.x;
if (nextX+nextW > monitor.x+monitor.width - minimumMargin) {
// Move the window so it remains fully visible
nextX = monitor.x+monitor.width - minimumMargin - nextW;
nextX = workArea.x + workArea.width - minimumMargin - nextW;
}
metaWindow.move_resize_frame(true, nextX, frame.y, nextW, frame.height);