infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-14 09:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

8265005: Introduce the new client property for mac: apple.awt.windowTitleVisible

Browse Source 
Reviewed-by: serb
This commit is contained in:
Alexey Ushakov 2021-04-29 07:31:10 +00:00 committed by Sergey Bylokhov
parent 91226fa122
commit 155da257fd
3 changed files with 160 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
View File

@ -122,6 +122,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
public static final String WINDOW_FULLSCREENABLE = "apple.awt.fullscreenable";
public static final String WINDOW_FULL_CONTENT = "apple.awt.fullWindowContent";
public static final String WINDOW_TRANSPARENT_TITLE_BAR = "apple.awt.transparentTitleBar";
public static final String WINDOW_TITLE_VISIBLE = "apple.awt.windowTitleVisible";
// Yeah, I know. But it's easier to deal with ints from JNI
static final int MODELESS = 0;
@ -164,10 +165,11 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
static final int DOCUMENT_MODIFIED = 1 << 21;
static final int FULLSCREENABLE = 1 << 23;
static final int TRANSPARENT_TITLE_BAR = 1 << 18;
static final int TITLE_VISIBLE = 1 << 25;
static final int _METHOD_PROP_BITMASK = RESIZABLE | HAS_SHADOW | ZOOMABLE | ALWAYS_ON_TOP | HIDES_ON_DEACTIVATE
| DRAGGABLE_BACKGROUND | DOCUMENT_MODIFIED | FULLSCREENABLE
| TRANSPARENT_TITLE_BAR;
| TRANSPARENT_TITLE_BAR | TITLE_VISIBLE;
// corresponds to callback-based properties
static final int SHOULD_BECOME_KEY = 1 << 12;
@ -248,6 +250,11 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
boolean isTransparentTitleBar = Boolean.parseBoolean(value.toString());
c.setStyleBits(TRANSPARENT_TITLE_BAR, isTransparentTitleBar);
}
},
new Property<CPlatformWindow>(WINDOW_TITLE_VISIBLE) {
public void applyProperty(final CPlatformWindow c, final Object value) {
c.setStyleBits(TITLE_VISIBLE, value == null ? true : Boolean.parseBoolean(value.toString()));
}
}
}) {
@SuppressWarnings("deprecation")
@ -374,7 +381,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
protected int getInitialStyleBits() {
// defaults style bits
int styleBits = DECORATED | HAS_SHADOW | CLOSEABLE | MINIMIZABLE | ZOOMABLE | RESIZABLE;
int styleBits = DECORATED | HAS_SHADOW | CLOSEABLE | MINIMIZABLE | ZOOMABLE | RESIZABLE | TITLE_VISIBLE;
if (isNativelyFocusableWindow()) {
styleBits = SET(styleBits, SHOULD_BECOME_KEY, true);
@ -496,6 +503,11 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
if (prop != null) {
styleBits = SET(styleBits, TRANSPARENT_TITLE_BAR, Boolean.parseBoolean(prop.toString()));
}
prop = rootpane.getClientProperty(WINDOW_TITLE_VISIBLE);
if (prop != null) {
styleBits = SET(styleBits, TITLE_VISIBLE, Boolean.parseBoolean(prop.toString()));
}
}
if (isDialog) {

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

@ -278,6 +278,11 @@ AWT_NS_WINDOW_IMPLEMENTATION
if (IS(mask, TRANSPARENT_TITLE_BAR) && [self.nsWindow respondsToSelector:@selector(setTitlebarAppearsTransparent:)]) {
[self.nsWindow setTitlebarAppearsTransparent:IS(bits, TRANSPARENT_TITLE_BAR)];
}
if (IS(mask, TITLE_VISIBLE) && [self.nsWindow respondsToSelector:@selector(setTitleVisibility:)]) {
[self.nsWindow setTitleVisibility:(IS(bits, TITLE_VISIBLE)) ? NSWindowTitleVisible :NSWindowTitleHidden];
}
}
- (id) initWithPlatformWindow:(jobject)platformWindow

141
test/jdk/java/awt/Window/WindowTitleVisibleTest/WindowTitleVisibleTest.java Normal file
View File

@ -0,0 +1,141 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, JetBrains s.r.o.. 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.
*/
/**
* @test
* @key headful
* @bug 8265005
* @summary [macosx] window title visibility test
* @author Alexey Ushakov
* @run main WindowTitleVisibleTest
* @requires (os.family == "mac")
*/
import java.awt.*;
import java.awt.image.BufferedImage;
import java.lang.reflect.InvocationTargetException;
import javax.swing.*;
public class WindowTitleVisibleTest
{
private static final int TD = 10;
static WindowTitleVisibleTest theTest;
private Robot robot;
private JFrame frame;
private JRootPane rootPane;
private int DELAY = 1000;
public WindowTitleVisibleTest() {
try {
robot = new Robot();
} catch (AWTException ex) {
throw new RuntimeException(ex);
}
}
public void performTest() {
runSwing(() -> {
frame = new JFrame("IIIIIIIIIIIIIIII");
frame.setBounds(100, 100, 300, 150);
rootPane = frame.getRootPane();
JComponent contentPane = (JComponent) frame.getContentPane();
JPanel comp = new JPanel();
contentPane.add(comp);
comp.setBackground(Color.RED);
frame.setVisible(true);
});
robot.delay(DELAY);
runSwing(() -> rootPane.putClientProperty("apple.awt.fullWindowContent", true));
runSwing(() -> rootPane.putClientProperty("apple.awt.transparentTitleBar", true));
runSwing(() -> rootPane.putClientProperty("apple.awt.windowTitleVisible", false));
robot.delay(DELAY);
for (int px = 140; px < 160; px++) {
for (int py = 5; py < 20; py++) {
Color c = getTestPixel(px, py);
if (!validateColor(c, Color.RED)) {
throw new RuntimeException("Test failed. Incorrect color " + c +
"at (" + px + "," + py + ")");
}
}
}
runSwing(() -> frame.dispose());
frame = null;
rootPane = null;
}
private Color getTestPixel(int x, int y) {
Rectangle bounds = frame.getBounds();
BufferedImage screenImage = robot.createScreenCapture(bounds);
int rgb = screenImage.getRGB(x, y);
int red = (rgb >> 16) & 0xFF;
int green = (rgb >> 8) & 0xFF;
int blue = rgb & 0xFF;
Color c = new Color(red, green, blue);
return c;
}
private boolean validateColor(Color c, Color expected) {
return Math.abs(c.getRed() - expected.getRed()) <= TD &&
Math.abs(c.getGreen() - expected.getGreen()) <= TD &&
Math.abs(c.getBlue() - expected.getBlue()) <= TD;
}
public void dispose() {
if (frame != null) {
frame.dispose();
frame = null;
}
}
private static void runSwing(Runnable r) {
try {
SwingUtilities.invokeAndWait(r);
} catch (InterruptedException e) {
} catch (InvocationTargetException e) {
throw new RuntimeException(e);
}
}
public static void main(String[] args) {
if (!System.getProperty("os.name").contains("OS X")) {
System.out.println("This test is for MacOS only. Automatically passed on other platforms.");
return;
}
try {
runSwing(() -> theTest = new WindowTitleVisibleTest());
theTest.performTest();
} finally {
if (theTest != null) {
runSwing(() -> theTest.dispose());
}
}
}
}