From 52feaac92a0b9007dec2a203ded9c880127c1d3c Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sun, 10 Jul 2022 14:03:45 +0200 Subject: [PATCH] Window decorations: no longer reduce height of window title bar if it has an embedded menu bar and is maximized --- CHANGELOG.md | 2 ++ .../src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd47512c..ae494763 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ FlatLaf Change Log - Window title now has a minimum width to always allow moving window (click-and-drag on window title). Instead, embedded menu bar is made smaller. + - No longer reduce height of window title bar if it has an embedded menu bar + and is maximized. #### Fixed bugs diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java index ba51272b..9441e70b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java @@ -265,7 +265,7 @@ public class FlatTitlePane @Override public Dimension getPreferredSize() { Dimension size = super.getPreferredSize(); - if( buttonMaximizedHeight > 0 && isWindowMaximized() ) { + if( buttonMaximizedHeight > 0 && isWindowMaximized() && !hasVisibleEmbeddedMenuBar( rootPane.getJMenuBar() ) ) { // make title pane height smaller when frame is maximized size = new Dimension( size.width, Math.min( size.height, UIScale.scale( buttonMaximizedHeight ) ) ); }