Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-08 15:00:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Window decorations: fixed maximized window bounds when programmatically maximizing window (issue #129)

Browse Source
This commit is contained in:
Karl Tauber
2020-07-17 00:08:21 +02:00
parent 093dd9f3ef
commit e7ec3988e2
2 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,6 +1,12 @@
FlatLaf Change Log FlatLaf Change Log
================== ==================
## Unreleased
- Custom window decorations: Fixed maximized window bounds when programmatically
maximizing window. E.g. restoring window state at startup. (issue #129)
## 0.38 ## 0.38
- Hide focus indicator when window is inactive. - Hide focus indicator when window is inactive.

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

@@ -148,10 +148,6 @@ public class FlatTitlePane
iconLabel.setBorder( new FlatEmptyBorder( UIManager.getInsets( "TitlePane.iconMargins" ) ) ); iconLabel.setBorder( new FlatEmptyBorder( UIManager.getInsets( "TitlePane.iconMargins" ) ) );
titleLabel.setBorder( new FlatEmptyBorder( UIManager.getInsets( "TitlePane.titleMargins" ) ) ); titleLabel.setBorder( new FlatEmptyBorder( UIManager.getInsets( "TitlePane.titleMargins" ) ) );
//TODO
// titleLabel.setHorizontalAlignment( JLabel.CENTER );
// titleLabel.setHorizontalAlignment( JLabel.RIGHT );
leftPanel.setLayout( new BoxLayout( leftPanel, BoxLayout.LINE_AXIS ) ); leftPanel.setLayout( new BoxLayout( leftPanel, BoxLayout.LINE_AXIS ) );
leftPanel.setOpaque( false ); leftPanel.setOpaque( false );
leftPanel.add( iconLabel ); leftPanel.add( iconLabel );
@@ -253,6 +249,22 @@ public class FlatTitlePane
iconifyButton.setVisible( true ); iconifyButton.setVisible( true );
maximizeButton.setVisible( resizable && !maximized ); maximizeButton.setVisible( resizable && !maximized );
restoreButton.setVisible( resizable && maximized ); restoreButton.setVisible( resizable && maximized );
if( maximized ) {
// In case that frame was maximized from custom code (e.g. when restoring
// window state on application startup), then maximized bounds is not set
// and the window would overlap Windows task bar.
// To avoid this, update maximized bounds here and if it has changed
// re-maximize windows so that maximized bounds are used.
Rectangle oldMaximizedBounds = frame.getMaximizedBounds();
updateMaximizedBounds();
Rectangle newMaximizedBounds = frame.getMaximizedBounds();
if( newMaximizedBounds != null && !newMaximizedBounds.equals( oldMaximizedBounds ) ) {
int oldExtendedState = frame.getExtendedState();
frame.setExtendedState( oldExtendedState & ~Frame.MAXIMIZED_BOTH );
frame.setExtendedState( oldExtendedState );
}
}
} else { } else {
// hide buttons because they are only supported in frames // hide buttons because they are only supported in frames
iconifyButton.setVisible( false ); iconifyButton.setVisible( false );
@@ -425,11 +437,21 @@ public class FlatTitlePane
Frame frame = (Frame) window; Frame frame = (Frame) window;
updateMaximizedBounds();
// maximize window
frame.setExtendedState( frame.getExtendedState() | Frame.MAXIMIZED_BOTH );
}
protected void updateMaximizedBounds() {
Frame frame = (Frame) window;
// set maximized bounds to avoid that maximized window overlaps Windows task bar // set maximized bounds to avoid that maximized window overlaps Windows task bar
// (if not running in JBR and if not modified from the application) // (if not running in JBR and if not modified from the application)
Rectangle oldMaximizedBounds = frame.getMaximizedBounds();
if( !hasJBRCustomDecoration() && if( !hasJBRCustomDecoration() &&
(frame.getMaximizedBounds() == null || (oldMaximizedBounds == null ||
Objects.equals( frame.getMaximizedBounds(), rootPane.getClientProperty( "_flatlaf.maximizedBounds" ) )) ) Objects.equals( oldMaximizedBounds, rootPane.getClientProperty( "_flatlaf.maximizedBounds" ) )) )
{ {
GraphicsConfiguration gc = window.getGraphicsConfiguration(); GraphicsConfiguration gc = window.getGraphicsConfiguration();
@@ -470,22 +492,21 @@ public class FlatTitlePane
// (see https://bugs.openjdk.java.net/browse/JDK-8231564 and // (see https://bugs.openjdk.java.net/browse/JDK-8231564 and
// https://bugs.openjdk.java.net/browse/JDK-8176359) // https://bugs.openjdk.java.net/browse/JDK-8176359)
// and except for Java 8 on secondary screens where primary screen is scaled // and except for Java 8 on secondary screens where primary screen is scaled
Rectangle maximizedBounds = new Rectangle( Rectangle newMaximizedBounds = new Rectangle(
maximizedX + screenInsets.left, maximizedX + screenInsets.left,
maximizedY + screenInsets.top, maximizedY + screenInsets.top,
maximizedWidth - screenInsets.left - screenInsets.right, maximizedWidth - screenInsets.left - screenInsets.right,
maximizedHeight - screenInsets.top - screenInsets.bottom ); maximizedHeight - screenInsets.top - screenInsets.bottom );
// change maximized bounds if( !Objects.equals( oldMaximizedBounds, newMaximizedBounds ) ) {
frame.setMaximizedBounds( maximizedBounds ); // change maximized bounds
frame.setMaximizedBounds( newMaximizedBounds );
// remember maximized bounds in client property to be able to detect // remember maximized bounds in client property to be able to detect
// whether maximized bounds are modified from the application // whether maximized bounds are modified from the application
rootPane.putClientProperty( "_flatlaf.maximizedBounds", maximizedBounds ); rootPane.putClientProperty( "_flatlaf.maximizedBounds", newMaximizedBounds );
}
} }
// maximize window
frame.setExtendedState( frame.getExtendedState() | Frame.MAXIMIZED_BOTH );
} }
/** /**