angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-12 15:07:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Window decorations: fixed exception in SwingUtilities.convertPoint() when doing new JDialog( (Window) null )

Browse Source 
regression since commits 54e6cefa67 and
fb37be5734
This commit is contained in:
Karl Tauber
2021-11-15 00:11:28 +01:00
parent fcc39b2db5
commit ce049ea3ee
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java
View File

@@ -224,6 +224,11 @@ public class FlatTitlePane
restoreButton = createButton( "TitlePane.restoreIcon", "Restore", e -> restore() ); restoreButton = createButton( "TitlePane.restoreIcon", "Restore", e -> restore() );
closeButton = createButton( "TitlePane.closeIcon", "Close", e -> close() ); closeButton = createButton( "TitlePane.closeIcon", "Close", e -> close() );
// initially hide buttons that are only supported in frames
iconifyButton.setVisible( false );
maximizeButton.setVisible( false );
restoreButton.setVisible( false );
buttonPanel = new JPanel() { buttonPanel = new JPanel() {
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
@@ -243,11 +248,9 @@ public class FlatTitlePane
if( rootPane.getWindowDecorationStyle() == JRootPane.FRAME ) { if( rootPane.getWindowDecorationStyle() == JRootPane.FRAME ) {
// JRootPane.FRAME works only for frames (and not for dialogs) // JRootPane.FRAME works only for frames (and not for dialogs)
// but at this time the owner window type is unknown (not yet added) // but at this time the owner window type is unknown (not yet added)
// so we add the iconify/maximize/restore buttons and they are hidden // so we add the iconify/maximize/restore buttons and they are shown
// later in frameStateChanged(), which is invoked from addNotify() // later in frameStateChanged(), which is invoked from addNotify()
restoreButton.setVisible( false );
buttonPanel.add( iconifyButton ); buttonPanel.add( iconifyButton );
buttonPanel.add( maximizeButton ); buttonPanel.add( maximizeButton );
buttonPanel.add( restoreButton ); buttonPanel.add( restoreButton );
@@ -813,7 +816,7 @@ debug*/
} }
private Rectangle boundsInWindow( JComponent c ) { private Rectangle boundsInWindow( JComponent c ) {
return c.isVisible() return c.isShowing()
? SwingUtilities.convertRectangle( c.getParent(), c.getBounds(), window ) ? SwingUtilities.convertRectangle( c.getParent(), c.getBounds(), window )
: null; : null;
} }