Skip to content

Commit

Permalink
Merge branch 'JFormDesigner:main' into classx
Browse files Browse the repository at this point in the history
  • Loading branch information
dar-dev authored Nov 20, 2024
2 parents 27f6d4f + ff5bd30 commit 5903b0a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ FlatLaf Change Log
factor. (issue #904)
- Linux: Fixed continuous cursor toggling between resize and standard cursor
when resizing window. (issue #907)
- Popup: On Windows 10, fixed misplaced popup drop shadow. (issue #911;
regression in 3.5)


## 3.5.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -695,8 +695,6 @@ void reset( Component contents, int ownerX, int ownerY ) {
Container contentPane = ((JWindow)popupWindow).getContentPane();
contentPane.removeAll();
contentPane.add( contents, BorderLayout.CENTER );
popupWindow.invalidate();
popupWindow.validate();
popupWindow.pack();

// update client property on contents
Expand Down Expand Up @@ -957,12 +955,13 @@ void reset( Component contents, int ownerX, int ownerY ) {
int w = prefSize.width + insets.left + insets.right;
int h = prefSize.height + insets.top + insets.bottom;
dropShadowPanel2.setPreferredSize( new Dimension( w, h ) );
dropShadowPanel2.invalidate();
dropShadowWindow.pack();

// update drop shadow popup window location and size
// update drop shadow popup window location
int x = popupWindow.getX() - insets.left;
int y = popupWindow.getY() - insets.top;
dropShadowWindow.setBounds( x, y, w, h );
dropShadowWindow.pack();
dropShadowWindow.setLocation( x, y );
}
}
}
Expand Down

0 comments on commit 5903b0a

Please sign in to comment.