franpcode/wintile
1
0
Fork 0
mirror of https://github.com/FranP-code/wintile.git synced 2025-10-13 00:33:46 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #49 from cascremers/master

Browse Source 
Fix for movement bug for gnome-terminal and [gnome-]terminator.
This commit is contained in:
Balazs Gyurak
2021-01-31 17:11:47 +00:00
committed by GitHub
parent 76c3d91c5b c97a04e619
commit f97a0ea7ac
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extension.js
View File

@@ -79,6 +79,18 @@ var oldbindings = {
toggle_tiled_right: [] toggle_tiled_right: []
} }
// Move window to specified location and size.
// On paper, the move_resize_frame should not need the preceding move_frame,
// but the additional move_frame is known to fix errors with gnome-terminal
// and [gnome-]terminator.
// A similar fix is used in the gTile extension:
// See https://github.com/gTile/gTile/commit/fc68797015e13143f74606fcbb9d48859f55dca9 by jshack88.
function moveAppCoordinates(app, x, y, w, h) {
_log("Moving window to ("+x+","+y+"), size ("+w+","+h+")" );
app.move_frame(true, x, y);
app.move_resize_frame(true, x, y, w, h);
}
function moveApp(app, loc) { function moveApp(app, loc) {
_log("moveApp: " + JSON.stringify(loc)); _log("moveApp: " + JSON.stringify(loc));
var space = null; var space = null;
@@ -99,12 +111,12 @@ function moveApp(app, loc) {
if (!config.useMaximize) { if (!config.useMaximize) {
unMaximizeIfMaximized(app); unMaximizeIfMaximized(app);
app.move_resize_frame(true, x, y, w, h); moveAppCoordinates(app, x, y, w, h);
} else { } else {
if (loc.height < 2 || loc.width < config.cols) { if (loc.height < 2 || loc.width < config.cols) {
unMaximizeIfMaximized(app); unMaximizeIfMaximized(app);
} }
app.move_resize_frame(true, x, y, w, h); moveAppCoordinates(app, x, y, w, h);
if (loc.height == 2 && loc.width == config.cols) { if (loc.height == 2 && loc.width == config.cols) {
// Maximize // Maximize
_log('maximize') _log('maximize')
@@ -184,7 +196,7 @@ function restoreApp(app, move=true) {
if (app.wintile.origFrame.y+app.wintile.origFrame.height > space.y+space.height) { if (app.wintile.origFrame.y+app.wintile.origFrame.height > space.y+space.height) {
app.wintile.origFrame.y = space.y + space.height - app.wintile.origFrame.height - 100; app.wintile.origFrame.y = space.y + space.height - app.wintile.origFrame.height - 100;
} }
app.move_resize_frame(true, app.wintile.origFrame.x, app.wintile.origFrame.y, app.wintile.origFrame.width, app.wintile.origFrame.height); moveAppCoordinates(app, app.wintile.origFrame.x, app.wintile.origFrame.y, app.wintile.origFrame.width, app.wintile.origFrame.height);
} else { } else {
// BUG: when clicking the maximize button, then dragging the window off, it moves to below the mouse cursor // BUG: when clicking the maximize button, then dragging the window off, it moves to below the mouse cursor
let [x, y, mask] = global.get_pointer(); let [x, y, mask] = global.get_pointer();
@@ -195,7 +207,7 @@ function restoreApp(app, move=true) {
window = app.wintile.origFrame; window = app.wintile.origFrame;
_log(`A) origFrame - x:${window.x} y:${window.y} w:${window.width} h:${window.height}`); _log(`A) origFrame - x:${window.x} y:${window.y} w:${window.width} h:${window.height}`);
} }
app.move_resize_frame(true, Math.floor(x-app.wintile.origFrame.width/2), y-10, app.wintile.origFrame.width, app.wintile.origFrame.height); moveAppCoordinates(app, Math.floor(x-app.wintile.origFrame.width/2), y-10, app.wintile.origFrame.width, app.wintile.origFrame.height);
if (config.debug) { if (config.debug) {
let window = app.get_frame_rect() let window = app.get_frame_rect()
_log(`B) mouse - x:${x} y:${y}`); _log(`B) mouse - x:${x} y:${y}`);