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

Linux: fixed double-click on title bar to maximize/restore on Ubuntu 22.04 (issue #482)

Browse Source
This commit is contained in:
Karl Tauber
2022-08-21 19:49:41 +02:00
parent 9f0554c883
commit bf4d4cc2c5
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1175,8 +1175,14 @@ debug*/
// on Linux, when using native library, the mouse clicked event // on Linux, when using native library, the mouse clicked event
// is usually not sent and maximize/restore is done in mouse pressed event // is usually not sent and maximize/restore is done in mouse pressed event
// this check is here for the case that a mouse clicked event comes thru for some reason // this check is here for the case that a mouse clicked event comes thru for some reason
if( SystemInfo.isLinux && FlatNativeLinuxLibrary.isWMUtilsSupported( window ) ) if( SystemInfo.isLinux && FlatNativeLinuxLibrary.isWMUtilsSupported( window ) ) {
// see comment in mousePressed()
if( lastSingleClickWhen != 0 && (e.getWhen() - lastSingleClickWhen) <= getMultiClickInterval() ) {
lastSingleClickWhen = 0;
maximizeOrRestore();
}
return; return;
}
if( e.getClickCount() == 2 && SwingUtilities.isLeftMouseButton( e ) ) { if( e.getClickCount() == 2 && SwingUtilities.isLeftMouseButton( e ) ) {
if( e.getSource() == iconLabel ) { if( e.getSource() == iconLabel ) {
@@ -1211,9 +1217,16 @@ debug*/
// on Linux, move or maximize/restore window // on Linux, move or maximize/restore window
if( SystemInfo.isLinux && FlatNativeLinuxLibrary.isWMUtilsSupported( window ) ) { if( SystemInfo.isLinux && FlatNativeLinuxLibrary.isWMUtilsSupported( window ) ) {
// The fired Java mouse events, when doing a double-click and the first click
// sends a _NET_WM_MOVERESIZE message, are different for various Linux distributions:
// CentOS 7 (GNOME 3.28.2, X11): PRESSED(clickCount=1) PRESSED(clickCount=2) RELEASED(clickCount=2)
// Ubuntu 20.04 (GNOME 3.36.1, X11): PRESSED(clickCount=1) PRESSED(clickCount=2) RELEASED(clickCount=2)
// Ubuntu 22.04 (GNOME 42.2, Wayland): PRESSED(clickCount=1) RELEASED(clickCount=1) CLICKED(clickCount=1)
// Kubuntu 22.04 (KDE 5.24.4, X11): PRESSED(clickCount=1) PRESSED(clickCount=1) RELEASED(clickCount=1)
// double-click is not always recognized in Java when using _NET_WM_MOVERESIZE message // double-click is not always recognized in Java when using _NET_WM_MOVERESIZE message
int clickCount = e.getClickCount(); int clickCount = e.getClickCount();
if( clickCount == 1 && (e.getWhen() - lastSingleClickWhen) <= getMultiClickInterval() ) if( clickCount == 1 && lastSingleClickWhen != 0 && (e.getWhen() - lastSingleClickWhen) <= getMultiClickInterval() )
clickCount = 2; clickCount = 2;
switch( clickCount ) { switch( clickCount ) {
@@ -1227,6 +1240,7 @@ debug*/
case 2: case 2:
// maximize/restore on double-click // maximize/restore on double-click
// also done here because no mouse clicked event is sent when using _NET_WM_MOVERESIZE message // also done here because no mouse clicked event is sent when using _NET_WM_MOVERESIZE message
lastSingleClickWhen = 0;
maximizeOrRestore(); maximizeOrRestore();
break; break;
} }
@@ -1235,7 +1249,7 @@ debug*/
private int getMultiClickInterval() { private int getMultiClickInterval() {
Object value = Toolkit.getDefaultToolkit().getDesktopProperty( "awt.multiClickInterval" ); Object value = Toolkit.getDefaultToolkit().getDesktopProperty( "awt.multiClickInterval" );
return (value instanceof Integer) ? (Integer) value : 200; return (value instanceof Integer) ? (Integer) value : 500;
} }
@Override public void mouseReleased( MouseEvent e ) {} @Override public void mouseReleased( MouseEvent e ) {}