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

Window decorations:

Browse Source 
- double-click on icon closes window
- after switching LaF is was not possible to move window when running in JetBrains Runtime
This commit is contained in:
Karl Tauber
2020-06-26 10:49:49 +02:00
parent 7720d42584
commit 7e8aaffb92
1 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,6 +122,9 @@ class FlatTitlePane
addMouseListener( handler ); addMouseListener( handler );
addMouseMotionListener( handler ); addMouseMotionListener( handler );
// necessary for closing window with double-click on icon
iconLabel.addMouseListener( handler );
} }
private void addSubComponents() { private void addSubComponents() {
@@ -258,6 +261,8 @@ class FlatTitlePane
if( hasImages ) if( hasImages )
iconLabel.setIcon( FlatTitlePaneIcon.create( images, iconSize ) ); iconLabel.setIcon( FlatTitlePaneIcon.create( images, iconSize ) );
updateJBRHitTestSpotsAndTitleBarHeightLater();
} }
@Override @Override
@@ -275,7 +280,7 @@ class FlatTitlePane
installWindowListeners(); installWindowListeners();
} }
updateJBRHitTestSpotsAndTitleBarHeight(); updateJBRHitTestSpotsAndTitleBarHeightLater();
} }
@Override @Override
@@ -446,11 +451,17 @@ class FlatTitlePane
} }
private boolean hasJBRCustomDecoration() { private boolean hasJBRCustomDecoration() {
return window != null && return FlatRootPaneUI.canUseJBRCustomDecorations &&
FlatRootPaneUI.canUseJBRCustomDecorations && window != null &&
JBRCustomDecorations.hasCustomDecoration( window ); JBRCustomDecorations.hasCustomDecoration( window );
} }
private void updateJBRHitTestSpotsAndTitleBarHeightLater() {
EventQueue.invokeLater( () -> {
updateJBRHitTestSpotsAndTitleBarHeight();
} );
}
private void updateJBRHitTestSpotsAndTitleBarHeight() { private void updateJBRHitTestSpotsAndTitleBarHeight() {
if( !isDisplayable() ) if( !isDisplayable() )
return; return;
@@ -459,8 +470,10 @@ class FlatTitlePane
return; return;
List<Rectangle> hitTestSpots = new ArrayList<>(); List<Rectangle> hitTestSpots = new ArrayList<>();
if( iconLabel.isVisible() )
addJBRHitTestSpot( iconLabel, false, hitTestSpots );
addJBRHitTestSpot( buttonPanel, false, hitTestSpots ); addJBRHitTestSpot( buttonPanel, false, hitTestSpots );
addJBRHitTestSpot( menuBarPlaceholder, true, hitTestSpots );//TOOD addJBRHitTestSpot( menuBarPlaceholder, true, hitTestSpots );
int titleBarHeight = getHeight(); int titleBarHeight = getHeight();
// slightly reduce height so that component receives mouseExit events // slightly reduce height so that component receives mouseExit events
@@ -548,9 +561,7 @@ class FlatTitlePane
break; break;
case "componentOrientation": case "componentOrientation":
EventQueue.invokeLater( () -> { updateJBRHitTestSpotsAndTitleBarHeightLater();
updateJBRHitTestSpotsAndTitleBarHeight();
} );
break; break;
} }
} }
@@ -588,20 +599,21 @@ class FlatTitlePane
@Override @Override
public void mouseClicked( MouseEvent e ) { public void mouseClicked( MouseEvent e ) {
if( hasJBRCustomDecoration() ) if( e.getClickCount() == 2 && SwingUtilities.isLeftMouseButton( e ) ) {
return; // do nothing if running in JBR if( e.getSource() == iconLabel ) {
// double-click on icon closes window
if( e.getClickCount() == 2 && close();
SwingUtilities.isLeftMouseButton( e ) && } else if( !hasJBRCustomDecoration() &&
window instanceof Frame && window instanceof Frame &&
((Frame)window).isResizable() ) ((Frame)window).isResizable() )
{ {
// maximize/restore on double-click // maximize/restore on double-click
Frame frame = (Frame) window; Frame frame = (Frame) window;
if( (frame.getExtendedState() & Frame.MAXIMIZED_BOTH) != 0 ) if( (frame.getExtendedState() & Frame.MAXIMIZED_BOTH) != 0 )
restore(); restore();
else else
maximize(); maximize();
}
} }
} }
@@ -667,9 +679,7 @@ class FlatTitlePane
@Override @Override
public void componentResized( ComponentEvent e ) { public void componentResized( ComponentEvent e ) {
EventQueue.invokeLater( () -> { updateJBRHitTestSpotsAndTitleBarHeightLater();
updateJBRHitTestSpotsAndTitleBarHeight();
} );
} }
@Override public void componentMoved( ComponentEvent e ) {} @Override public void componentMoved( ComponentEvent e ) {}