stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7124404: [macosx] no awt.multiClickInterval desktop property

Browse Source 
Reviewed-by: dmarkov
This commit is contained in:
Sergey Bylokhov 2019-10-01 10:28:12 -07:00
parent d6e6060b19
commit 876251f840
3 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -444,6 +444,7 @@ public final class LWCToolkit extends LWToolkit {
fontHints.put(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
desktopProperties.put(SunToolkit.DESKTOPFONTHINTS, fontHints);
desktopProperties.put("awt.mouse.numButtons", BUTTONS);
desktopProperties.put("awt.multiClickInterval", getMultiClickTime());
// These DnD properties must be set, otherwise Swing ends up spewing NPEs
// all over the place. The values came straight off of MToolkit.
@ -538,6 +539,11 @@ public final class LWCToolkit extends LWToolkit {
return BUTTONS;
}
/**
* Returns the double-click time interval in ms.
*/
private static native int getMultiClickTime();
@Override
public boolean isTraySupported() {
return true;

18
src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -831,3 +831,19 @@ Java_sun_awt_PlatformGraphicsInfo_isInAquaSession
}
return JNI_FALSE;
}
/*
* Class: sun_lwawt_macosx_LWCToolkit
* Method: getMultiClickTime
* Signature: ()I
*/
JNIEXPORT jint JNICALL
Java_sun_lwawt_macosx_LWCToolkit_getMultiClickTime(JNIEnv *env, jclass klass) {
__block jint multiClickTime = 0;
JNF_COCOA_ENTER(env);
[JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
multiClickTime = (jint)([NSEvent doubleClickInterval] * 1000);
}];
JNF_COCOA_EXIT(env);
return multiClickTime;
}

41
test/jdk/java/awt/Toolkit/GetMulticlickTime/GetMulticlickTime.java Normal file
View File

@ -0,0 +1,41 @@
/*
* Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.awt.Toolkit;
/**
* @test
* @key headful
* @bug 4559047 7124404
* @summary Solaris/Linux/macOS do not set awt.multiClickInterval desktop property
*/
public final class GetMulticlickTime {
public static void main(final String[] args) {
Integer time = (Integer) Toolkit.getDefaultToolkit()
.getDesktopProperty("awt.multiClickInterval");
if (time == null || time <= 0 || time > 30_000) {
throw new RuntimeException("awt.multiClickInterval:" + time);
}
}
}