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

Window decorations: nested class FlatRootPaneUI.FlatRootLayout is no longer static (issues #47 and #82)

Browse Source
This commit is contained in:
Karl Tauber
2020-05-31 14:53:13 +02:00
parent 7ccd32dfbd
commit 10c948d33c
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,7 +131,7 @@ public class FlatRootPaneUI
//---- class FlatRootLayout ----------------------------------------------- //---- class FlatRootLayout -----------------------------------------------
private static class FlatRootLayout private class FlatRootLayout
implements LayoutManager2 implements LayoutManager2
{ {
@Override public void addLayoutComponent( String name, Component comp ) {} @Override public void addLayoutComponent( String name, Component comp ) {}
@@ -155,7 +155,6 @@ public class FlatRootPaneUI
private Dimension computeLayoutSize( Container parent, Function<Component, Dimension> getSizeFunc ) { private Dimension computeLayoutSize( Container parent, Function<Component, Dimension> getSizeFunc ) {
JRootPane rootPane = (JRootPane) parent; JRootPane rootPane = (JRootPane) parent;
FlatTitlePane titlePane = getTitlePane( rootPane );
Dimension titlePaneSize = (titlePane != null) Dimension titlePaneSize = (titlePane != null)
? getSizeFunc.apply( titlePane ) ? getSizeFunc.apply( titlePane )
@@ -182,13 +181,6 @@ public class FlatRootPaneUI
height + insets.top + insets.bottom ); height + insets.top + insets.bottom );
} }
private FlatTitlePane getTitlePane( JRootPane rootPane ) {
return (rootPane.getWindowDecorationStyle() != JRootPane.NONE &&
rootPane.getUI() instanceof FlatRootPaneUI)
? ((FlatRootPaneUI)rootPane.getUI()).titlePane
: null;
}
@Override @Override
public void layoutContainer( Container parent ) { public void layoutContainer( Container parent ) {
JRootPane rootPane = (JRootPane) parent; JRootPane rootPane = (JRootPane) parent;
@@ -205,7 +197,6 @@ public class FlatRootPaneUI
rootPane.getGlassPane().setBounds( x, y, width, height ); rootPane.getGlassPane().setBounds( x, y, width, height );
int nextY = 0; int nextY = 0;
FlatTitlePane titlePane = getTitlePane( rootPane );
if( titlePane != null ) { if( titlePane != null ) {
Dimension prefSize = titlePane.getPreferredSize(); Dimension prefSize = titlePane.getPreferredSize();
titlePane.setBounds( 0, 0, width, prefSize.height ); titlePane.setBounds( 0, 0, width, prefSize.height );
@@ -231,7 +222,6 @@ public class FlatRootPaneUI
@Override @Override
public void invalidateLayout( Container parent ) { public void invalidateLayout( Container parent ) {
FlatTitlePane titlePane = getTitlePane( (JRootPane) parent );
if( titlePane != null && titlePane.isMenuBarEmbedded() ) if( titlePane != null && titlePane.isMenuBarEmbedded() )
titlePane.menuBarChanged(); titlePane.menuBarChanged();
} }