mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2026-01-10 18:41:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-3677 check AppleActionOnDoubleClick property for custom window decorations on macOS

Browse Source 
with fix for JBR-5300 Change source code and test files to use GPL license
This commit is contained in:
Nikita Gubarkov
2022-09-15 17:02:59 +03:00
committed by jbrbot
parent 94f5f4a2f5
commit dcbd758be0
2 changed files with 116 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m
View File

@@ -1555,7 +1555,11 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
} else {
jint hitSpot = [self hitTestCustomDecoration:event.locationInWindow];
if (event.clickCount == 2 && hitSpot == java_awt_Window_CustomWindowDecoration_NO_HIT_SPOT) {
[self.window performZoom:nil];
if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"AppleActionOnDoubleClick"] isEqualToString:@"Maximize"]) {
[self.window performZoom:nil];
} else {
[self.window performMiniaturize:nil];
}
}
// We don't follow the regular responder chain here since the native window swallows events in some cases

111
test/jdk/jb/java/api/frontend/CustomTitleBarDoubleClick.java Normal file
View File

@@ -0,0 +1,111 @@
/*
* Copyright 2000-2023 JetBrains s.r.o.
* 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.
*/
/*
@test
@requires os.family == "mac" | os.family == "windows"
@key headful
@summary Test that window state changes on titlebar double-click
@library ../../../../java/awt/regtesthelpers
@build Util
@run shell build.sh
@run main CustomTitleBarDoubleClick
*/
import com.jetbrains.JBR;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import test.java.awt.regtesthelpers.Util;
public class CustomTitleBarDoubleClick implements WindowListener, WindowStateListener {
//Declare things used in the test, like buttons and labels here
private final static Rectangle BOUNDS = new Rectangle(300, 300, 300, 300);
private final static int TITLE_BAR_OFFSET = 10;
JFrame frame;
Robot robot;
boolean stateChanged;
public static void main(final String[] args) {
CustomTitleBarDoubleClick app = new CustomTitleBarDoubleClick();
app.start();
}
public void start () {
robot = Util.createRobot();
robot.setAutoDelay(100);
robot.mouseMove(BOUNDS.x + (BOUNDS.width / 2),
BOUNDS.y + (BOUNDS.height/ 2));
frame = new JFrame("CustomTitleBarDoubleClick"); // Custom decorations doesn't work for AWT Frames on macOS
frame.setBounds(BOUNDS);
frame.addWindowListener(this);
frame.addWindowStateListener(this);
JBR.getCustomWindowDecoration().setCustomDecorationEnabled(frame, true);
JBR.getCustomWindowDecoration().setCustomDecorationTitleBarHeight(frame, 50);
frame.setVisible(true);
robot.delay(2000);
if (!stateChanged) throw new AWTError("Test failed");
}
// Move the mouse into the title bar and double click to maximize the Frame
static boolean hasRun = false;
private void doTest() {
if (hasRun) return;
hasRun = true;
System.out.println("doing test");
robot.mouseMove(BOUNDS.x + (BOUNDS.width / 2),
BOUNDS.y + TITLE_BAR_OFFSET);
robot.delay(50);
// Util.waitForIdle(robot) seem always hangs here.
// Need to use it instead robot.delay() when the bug become fixed.
System.out.println("1st press: currentTimeMillis: " + System.currentTimeMillis());
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.delay(50);
System.out.println("1st release: currentTimeMillis: " + System.currentTimeMillis());
robot.mouseRelease(InputEvent.BUTTON1_MASK);
robot.delay(50);
System.out.println("2nd press: currentTimeMillis: " + System.currentTimeMillis());
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.delay(50);
System.out.println("2nd release: currentTimeMillis: " + System.currentTimeMillis());
robot.mouseRelease(InputEvent.BUTTON1_MASK);
System.out.println("done: currentTimeMillis: " + System.currentTimeMillis());
}
public void windowActivated(WindowEvent e) {doTest();}
public void windowClosed(WindowEvent e) {}
public void windowClosing(WindowEvent e) {}
public void windowDeactivated(WindowEvent e) {}
public void windowDeiconified(WindowEvent e) {}
public void windowIconified(WindowEvent e) {}
public void windowOpened(WindowEvent e) {}
public void windowStateChanged(WindowEvent e) {
stateChanged = true; // On macOS double-click may cause window to be maximized or iconified depending on AppleActionOnDoubleClick setting
}
}