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

Window decorations: do not center window title if embedded menu bar is empty or has no menus at left side, but some components at right side (issue #558)

Browse Source
This commit is contained in:
Karl Tauber
2022-07-09 00:04:51 +02:00
parent 7437d984c7
commit 9977bcb468
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG.md
View File

@@ -13,11 +13,13 @@ FlatLaf Change Log
- `HiDPIUtils.paintAtScale1x()` now supports rotated graphics. (issue #557) - `HiDPIUtils.paintAtScale1x()` now supports rotated graphics. (issue #557)
- Typography: No longer use `Consolas` or `Courier New` as monospaced font on - Typography: No longer use `Consolas` or `Courier New` as monospaced font on
Windows because they have bad vertically placement. Windows because they have bad vertically placement.
- Native window decorations (Windows 10/11 only): Do not use window decorations - Native window decorations (Windows 10/11 only):
if system property `sun.java2d.opengl` is `true` on Windows 10. (issue #540) - Do not center window title if embedded menu bar is empty or has no menus at
- Native window decorations (Windows 10 only): Fixed missing top window border left side, but some components at right side. (issue #558)
in dark themes if window drop shadows are disabled in system settings. (issue - Do not use window decorations if system property `sun.java2d.opengl` is
#554) `true` on Windows 10. (issue #540)
- Fixed missing top window border in dark themes if window drop shadows are
disabled in system settings. (issue #554; Windows 10 only)
## 2.3 ## 2.3

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

@@ -899,7 +899,8 @@ debug*/
@Override @Override
protected void paintEnabledText( JLabel l, Graphics g, String s, int textX, int textY ) { protected void paintEnabledText( JLabel l, Graphics g, String s, int textX, int textY ) {
boolean hasEmbeddedMenuBar = hasVisibleEmbeddedMenuBar( rootPane.getJMenuBar() ); JMenuBar menuBar = rootPane.getJMenuBar();
boolean hasEmbeddedMenuBar = hasVisibleEmbeddedMenuBar( menuBar ) && hasMenus( menuBar );
int labelWidth = l.getWidth(); int labelWidth = l.getWidth();
int textWidth = labelWidth - (textX * 2); int textWidth = labelWidth - (textX * 2);
int gap = UIScale.scale( menuBarTitleGap ); int gap = UIScale.scale( menuBarTitleGap );
@@ -925,6 +926,24 @@ debug*/
super.paintEnabledText( l, g, s, textX, textY ); super.paintEnabledText( l, g, s, textX, textY );
} }
private boolean hasMenus( JMenuBar menuBar ) {
// check whether menu bar is empty
if( menuBar.getComponentCount() == 0 || menuBar.getWidth() == 0 )
return false;
// check whether menu bar has a leading glue component
// (no menus/components at left side)
Component horizontalGlue = findHorizontalGlue( menuBar );
if( horizontalGlue != null ) {
boolean leftToRight = getComponentOrientation().isLeftToRight();
if( (leftToRight && horizontalGlue.getX() == 0) ||
(!leftToRight && horizontalGlue.getX() + horizontalGlue.getWidth() == menuBar.getWidth()) )
return false;
}
return true;
}
} }
//---- class Handler ------------------------------------------------------ //---- class Handler ------------------------------------------------------