mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-9378 Wayland: Nullpointer exception in DefaultFrameDecoration, IDE hang on KDE

Browse Source
This commit is contained in:
Maxim Kartashev
2025-09-23 13:29:30 +04:00
parent 1b06a68e0a
commit 7ff57dcd22
2 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.desktop/unix/classes/sun/awt/wl/DefaultFrameDecoration.java
View File

@@ -114,6 +114,8 @@ public class DefaultFrameDecoration extends FullFrameDecorationHelper {
@Override
protected Rectangle getMaximizeButtonBounds() {
if (!hasMaximizeButton()) return null;
int x = peer.getWidth() - BUTTON_SIZE * 2 - BUTTONS_RIGHT_PADDING
- BUTTONS_PADDING - BORDER_SIZE;
int y = (int) Math.floor((HEIGHT - BUTTON_SIZE + 1f) / 2);
@@ -122,6 +124,8 @@ public class DefaultFrameDecoration extends FullFrameDecorationHelper {
@Override
protected Rectangle getMinimizeButtonBounds() {
if (!hasMinimizeButton()) return null;
int x = peer.getWidth() - BUTTON_SIZE * 3 - BUTTONS_RIGHT_PADDING
- BUTTONS_PADDING * 2 - BORDER_SIZE;
int y = (int) Math.floor((HEIGHT - BUTTON_SIZE + 1f) / 2);

76
test/jdk/jb/javax/swing/wayland/CloseOnlyDialogShownTest.java Normal file
View File

@@ -0,0 +1,76 @@
/*
* Copyright 2025 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
* @summary
* @requires os.family == "linux"
* @key headful
* @library /test/lib
* @run main/othervm -Dsun.awt.wl.WindowDecorationStyle=builtin CloseOnlyDialogShownTest
*/
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.SwingUtilities;
import java.awt.Dimension;
import java.awt.Robot;
import java.util.concurrent.atomic.AtomicReference;
public class CloseOnlyDialogShownTest {
public static void main(String[] args) throws Throwable {
AtomicReference<Throwable> edtFailure = new AtomicReference<>();
Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
if (SwingUtilities.isEventDispatchThread()) {
edtFailure.compareAndSet(null, e);
e.printStackTrace();
}
});
AtomicReference<JDialog> holder = new AtomicReference<>();
SwingUtilities.invokeAndWait(() -> {
JDialog dialog = new JDialog((java.awt.Frame) null, "Close-only window", false);
holder.set(dialog);
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.add(new JLabel("This dialog should show with only a close button."));
dialog.setMinimumSize(new Dimension(200, 120));
dialog.setVisible(true);
});
Robot robot = new Robot();
robot.waitForIdle();
robot.delay(500);
SwingUtilities.invokeAndWait(() -> {
JDialog dialog = holder.get();
if (dialog != null) {
dialog.dispose();
}
});
if (edtFailure.get() != null) {
throw edtFailure.get();
}
}
}