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: support right-to-left component orientation (issues #47 and #82)

Browse Source
This commit is contained in:
Karl Tauber
2020-05-30 12:41:22 +02:00
parent 436fc545c0
commit 5add723852
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,9 +115,9 @@ class FlatTitlePane
createButtons(); createButtons();
setLayout( new BorderLayout() ); setLayout( new BorderLayout() );
add( iconLabel, BorderLayout.WEST ); add( iconLabel, BorderLayout.LINE_START );
add( titleLabel, BorderLayout.CENTER ); add( titleLabel, BorderLayout.CENTER );
add( buttonPanel, BorderLayout.EAST ); add( buttonPanel, BorderLayout.LINE_END );
} }
private void createButtons() { private void createButtons() {
@@ -141,7 +141,7 @@ class FlatTitlePane
} }
}; };
buttonPanel.setOpaque( false ); buttonPanel.setOpaque( false );
buttonPanel.setLayout( new BoxLayout( buttonPanel, BoxLayout.X_AXIS ) ); buttonPanel.setLayout( new BoxLayout( buttonPanel, BoxLayout.LINE_AXIS ) );
if( rootPane.getWindowDecorationStyle() == JRootPane.FRAME ) { if( rootPane.getWindowDecorationStyle() == JRootPane.FRAME ) {
// JRootPane.FRAME works only for frames (and not for dialogs) // JRootPane.FRAME works only for frames (and not for dialogs)
// but at this time the owner window type is unknown (not yet added) // but at this time the owner window type is unknown (not yet added)
@@ -418,6 +418,12 @@ class FlatTitlePane
case "iconImage": case "iconImage":
updateIcon(); updateIcon();
break; break;
case "componentOrientation":
EventQueue.invokeLater( () -> {
updateJBRHitTestSpotsAndTitleBarHeight();
} );
break;
} }
} }
@@ -500,8 +506,9 @@ class FlatTitlePane
int restoredWidth = window.getWidth(); int restoredWidth = window.getWidth();
int newX = maximizedX; int newX = maximizedX;
if( xOnScreen >= maximizedX + restoredWidth - buttonPanel.getWidth() - 10 ) JComponent rightComp = getComponentOrientation().isLeftToRight() ? buttonPanel : iconLabel;
newX = xOnScreen + buttonPanel.getWidth() + 10 - restoredWidth; if( xOnScreen >= maximizedX + restoredWidth - rightComp.getWidth() - 10 )
newX = xOnScreen + rightComp.getWidth() + 10 - restoredWidth;
// move window near mouse // move window near mouse
window.setLocation( newX, maximizedY ); window.setLocation( newX, maximizedY );