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

Window decorations: no longer honor minimum size of frames on resizing window, but still do for dialogs

Browse Source
This commit is contained in:
Karl Tauber
2020-07-06 11:30:49 +02:00
parent cace4a9bfd
commit 7f911b61a2
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRootPaneUI.java
View File

@@ -59,7 +59,8 @@ import com.formdev.flatlaf.util.SystemInfo;
* *
* @uiDefault RootPane.borderDragThickness int * @uiDefault RootPane.borderDragThickness int
* @uiDefault RootPane.cornerDragWidth int * @uiDefault RootPane.cornerDragWidth int
* @uiDefault RootPane.honorMinimumSizeOnResize boolean * @uiDefault RootPane.honorFrameMinimumSizeOnResize boolean
* @uiDefault RootPane.honorDialogMinimumSizeOnResize boolean
* *
* @author Karl Tauber * @author Karl Tauber
*/ */

6
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java
View File

@@ -57,7 +57,8 @@ public class FlatWindowResizer
protected final int borderDragThickness = FlatUIUtils.getUIInt( "RootPane.borderDragThickness", 5 ); protected final int borderDragThickness = FlatUIUtils.getUIInt( "RootPane.borderDragThickness", 5 );
protected final int cornerDragWidth = FlatUIUtils.getUIInt( "RootPane.cornerDragWidth", 16 ); protected final int cornerDragWidth = FlatUIUtils.getUIInt( "RootPane.cornerDragWidth", 16 );
protected final boolean honorMinimumSizeOnResize = UIManager.getBoolean( "RootPane.honorMinimumSizeOnResize" ); protected final boolean honorFrameMinimumSizeOnResize = UIManager.getBoolean( "RootPane.honorFrameMinimumSizeOnResize" );
protected final boolean honorDialogMinimumSizeOnResize = UIManager.getBoolean( "RootPane.honorDialogMinimumSizeOnResize" );
protected Window window; protected Window window;
@@ -293,6 +294,9 @@ debug*/
newBounds.height += deltaHeight; newBounds.height += deltaHeight;
// apply minimum window size // apply minimum window size
boolean honorMinimumSizeOnResize =
(honorFrameMinimumSizeOnResize && window instanceof Frame) ||
(honorDialogMinimumSizeOnResize && window instanceof Dialog);
Dimension minimumSize = honorMinimumSizeOnResize ? window.getMinimumSize() : null; Dimension minimumSize = honorMinimumSizeOnResize ? window.getMinimumSize() : null;
if( minimumSize == null ) if( minimumSize == null )
minimumSize = UIScale.scale( new Dimension( 150, 50 ) ); minimumSize = UIScale.scale( new Dimension( 150, 50 ) );

3
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
View File

@@ -430,7 +430,8 @@ RadioButtonMenuItem.background=@menuBackground
RootPane.border=com.formdev.flatlaf.ui.FlatRootPaneUI$FlatWindowBorder RootPane.border=com.formdev.flatlaf.ui.FlatRootPaneUI$FlatWindowBorder
RootPane.borderDragThickness=5 RootPane.borderDragThickness=5
RootPane.cornerDragWidth=16 RootPane.cornerDragWidth=16
RootPane.honorMinimumSizeOnResize=true RootPane.honorFrameMinimumSizeOnResize=false
RootPane.honorDialogMinimumSizeOnResize=true
#---- ScrollBar ---- #---- ScrollBar ----

3
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt
View File

@@ -765,7 +765,8 @@ RootPane.defaultButtonWindowKeyBindings length=8 [Ljava.lang.Object;
[5] press [5] press
[6] ctrl released ENTER [6] ctrl released ENTER
[7] release [7] release
RootPane.honorMinimumSizeOnResize true RootPane.honorDialogMinimumSizeOnResize true
RootPane.honorFrameMinimumSizeOnResize false
RootPane.inactiveBorderColor #484c4e com.formdev.flatlaf.util.DerivedColor [UI] darken(5% autoInverse) RootPane.inactiveBorderColor #484c4e com.formdev.flatlaf.util.DerivedColor [UI] darken(5% autoInverse)
RootPaneUI com.formdev.flatlaf.ui.FlatRootPaneUI RootPaneUI com.formdev.flatlaf.ui.FlatRootPaneUI

3
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt
View File

@@ -770,7 +770,8 @@ RootPane.defaultButtonWindowKeyBindings length=8 [Ljava.lang.Object;
[5] press [5] press
[6] ctrl released ENTER [6] ctrl released ENTER
[7] release [7] release
RootPane.honorMinimumSizeOnResize true RootPane.honorDialogMinimumSizeOnResize true
RootPane.honorFrameMinimumSizeOnResize false
RootPane.inactiveBorderColor #a3a3a3 javax.swing.plaf.ColorUIResource [UI] RootPane.inactiveBorderColor #a3a3a3 javax.swing.plaf.ColorUIResource [UI]
RootPaneUI com.formdev.flatlaf.ui.FlatRootPaneUI RootPaneUI com.formdev.flatlaf.ui.FlatRootPaneUI