Skip to content

Commit 93acd0a

Browse files
committed
Plasma 6.6.x broke KWin::RectF - adapt to the new implementation.
1 parent 0214264 commit 93acd0a

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

src/contents/ui/main.qml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ Item {
554554
if (saveData.tile && config.restoreTile && (!client.tile || config.restoreResizedQuickTile)) {
555555
let tile = saveData.tile;
556556
log('Attemptying to restore tile: ' + JSON.stringify(tile));
557-
if (tile.quick && config.restoreResizedQuickTile || Math.ceil(client.frameGeometry.left) >= Math.floor(tile.x) && Math.ceil(client.frameGeometry.top) >= Math.floor(tile.y) && Math.floor(client.frameGeometry.right) <= Math.ceil(tile.x + tile.width) && Math.floor(client.frameGeometry.bottom) <= Math.ceil(tile.y + tile.height)) {
557+
if (tile.quick && config.restoreResizedQuickTile || Math.ceil(client.frameGeometry.x) >= Math.floor(tile.x) && Math.ceil(client.frameGeometry.y) >= Math.floor(tile.y) && Math.floor(client.frameGeometry.x + client.frameGeometry.width) <= Math.ceil(tile.x + tile.width) && Math.floor(client.frameGeometry.y + client.frameGeometry.height) <= Math.ceil(tile.y + tile.height)) {
558558
if (tile.quick) {
559559
let clientArea = Workspace.clientArea(KWin.FullScreenArea, client.output, Workspace.currentDesktop);
560560
let tileX = Math.max(tile.x, clientArea.left);
@@ -651,10 +651,10 @@ Item {
651651
(Math.abs(relativeGeometry.width - 0.5) < 0.001 || Math.abs(relativeGeometry.width - 1) < 0.001) &&
652652
(Math.abs(relativeGeometry.height - 0.5) < 0.001 || Math.abs(relativeGeometry.height - 1) < 0.001)
653653
) {
654-
let left = Math.abs(relativeGeometry.left) < 0.001 && relativeGeometry.right < 0.999;
655-
let right = relativeGeometry.left >= 0.001 && Math.abs(relativeGeometry.right - 1) < 0.001;
656-
let top = Math.abs(relativeGeometry.top) < 0.001 && relativeGeometry.bottom < 0.999;
657-
let bottom = relativeGeometry.top >= 0.001 && Math.abs(relativeGeometry.bottom - 1) < 0.001;
654+
let left = Math.abs(relativeGeometry.x) < 0.001 && (relativeGeometry.x + relativeGeometry.width) < 0.999;
655+
let right = relativeGeometry.x >= 0.001 && Math.abs(relativeGeometry.x + relativeGeometry.width - 1) < 0.001;
656+
let top = Math.abs(relativeGeometry.y) < 0.001 && (relativeGeometry.y + relativeGeometry.height) < 0.999;
657+
let bottom = relativeGeometry.y >= 0.001 && Math.abs(relativeGeometry.y + relativeGeometry.height - 1) < 0.001;
658658
log('convertTileData found matching edge tile left: ' + left + ' right: ' + right + ' top: ' + top + ' bottom: ' + bottom);
659659
converted.quick = true;
660660
converted.x = absoluteGeometry.x;
@@ -667,13 +667,13 @@ Item {
667667
converted.bottom = bottom;
668668
} else if (
669669
config.restoreResizedQuickTile &&
670-
(Math.abs(relativeGeometry.left) < 0.001 || Math.abs(relativeGeometry.right - 1) < 0.001) &&
671-
(Math.abs(relativeGeometry.top) < 0.001 || Math.abs(relativeGeometry.bottom - 1) < 0.001)
670+
(Math.abs(relativeGeometry.x) < 0.001 || Math.abs(relativeGeometry.x + relativeGeometry.width - 1) < 0.001) &&
671+
(Math.abs(relativeGeometry.y) < 0.001 || Math.abs(relativeGeometry.y + relativeGeometry.height - 1) < 0.001)
672672
) {
673-
let left = Math.abs(relativeGeometry.left) < 0.001 && relativeGeometry.right < 0.999;
674-
let right = relativeGeometry.left >= 0.001 && Math.abs(relativeGeometry.right - 1) < 0.001;
675-
let top = Math.abs(relativeGeometry.top) < 0.001 && relativeGeometry.bottom < 0.999;
676-
let bottom = relativeGeometry.top >= 0.001 && Math.abs(relativeGeometry.bottom - 1) < 0.001;
673+
let left = Math.abs(relativeGeometry.x) < 0.001 && (relativeGeometry.x + relativeGeometry.width) < 0.999;
674+
let right = relativeGeometry.x >= 0.001 && Math.abs(relativeGeometry.x + relativeGeometry.width - 1) < 0.001;
675+
let top = Math.abs(relativeGeometry.y) < 0.001 && (relativeGeometry.y + relativeGeometry.height) < 0.999;
676+
let bottom = relativeGeometry.y >= 0.001 && Math.abs(relativeGeometry.y + relativeGeometry.height - 1) < 0.001;
677677
log('convertTileData found matching resized edge tile left: ' + left + ' right: ' + right + ' top: ' + top + ' bottom: ' + bottom);
678678
converted.quick = true;
679679
converted.x = absoluteGeometry.x;

src/metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"Description": "Save and restore application window positions (such as multi-window browsers)",
1111
"Icon": "preferences-desktop-virtual",
1212
"Id": "rememberwindowpositions",
13-
"Version": "5.4.4",
13+
"Version": "5.4.5",
1414
"License": "GPLv3",
1515
"Website": "https://github.com/rxappdev/RememberWindowPositions"
1616
},

0 commit comments

Comments
 (0)