Window decorations: fixed broken window resizing on Linux multi-scree…

…n setups (issue #632)
JFormDesigner · Jan 2, 2023 · 4b84435 · 4b84435
1 parent 2134c19
commit 4b84435
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ FlatLaf Change Log
 
 #### Fixed bugs
 
+- FlatLaf window decorations on Linux: Fixed broken window resizing on
+  multi-screen setups. (issue #632)
 - IntelliJ Themes:
   - Fixed default button hover background in "Solarized Light" theme. (issue
     #628)

diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java
@@ -606,9 +606,10 @@ public void mouseDragged( MouseEvent e ) {
 			if( resizeDir == S_RESIZE_CURSOR || resizeDir == SW_RESIZE_CURSOR || resizeDir == SE_RESIZE_CURSOR ) {
 				newBounds.height = (yOnScreen + dragBottomOffset) - newBounds.y;
 				if( limitToParentBounds() ) {
-					int parentHeight = getParentBounds().height;
-					if( newBounds.y + newBounds.height > parentHeight )
-						newBounds.height = parentHeight - newBounds.y;
+					Rectangle parentBounds = getParentBounds();
+					int parentBottomY = parentBounds.y + parentBounds.height;
+					if( newBounds.y + newBounds.height > parentBottomY )
+						newBounds.height = parentBottomY - newBounds.y;
 				}
 			}
 
@@ -624,9 +625,10 @@ public void mouseDragged( MouseEvent e ) {
 			if( resizeDir == E_RESIZE_CURSOR || resizeDir == NE_RESIZE_CURSOR || resizeDir == SE_RESIZE_CURSOR ) {
 				newBounds.width = (xOnScreen + dragRightOffset) - newBounds.x;
 				if( limitToParentBounds() ) {
-					int parentWidth = getParentBounds().width;
-					if( newBounds.x + newBounds.width > parentWidth )
-						newBounds.width = parentWidth - newBounds.x;
+					Rectangle parentBounds = getParentBounds();
+					int parentRightX = parentBounds.x + parentBounds.width;
+					if( newBounds.x + newBounds.width > parentRightX )
+						newBounds.width = parentRightX - newBounds.x;
 				}
 			}