MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-324605 Global burger menu is unusable (KDE) - fix NPE

Browse Source 
GitOrigin-RevId: fdac0aa2940e0aff805bf925f889c0b30284747d
This commit is contained in:
Vladimir Krivosheev
2023-10-09 08:18:04 +00:00
committed by intellij-monorepo-bot
parent c0231abca2
commit ebcef42b2c
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/platform/ide/menu/GlobalMenuLinux.java
+18 -9
View File
@@ -36,6 +36,7 @@ import com.sun.jna.Native;
import com.sun.jna.Pointer;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.imageio.ImageIO;
import javax.swing.Timer;
@@ -195,13 +196,13 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo
LOG.info("Closed dbus-service 'com.canonical.AppMenu.Registrar'");
isServiceAvailable = false;
boolean isMainMenuVisible = UISettings.getInstance().getShowMainMenu();
for (GlobalMenuLinux menuBar : instances) {
menuBar.windowHandle = null;
for (GlobalMenuLinux menuLinux : instances) {
menuLinux.windowHandle = null;
if (isMainMenuVisible) {
ApplicationManager.getApplication().invokeLater(() -> {
JMenuBar jmenubar = menuBar.frame.getRootPane().getJMenuBar();
if (jmenubar != null) {
jmenubar.setVisible(true);
EventQueue.invokeLater(() -> {
JMenuBar menuBar = getMenuBar(menuLinux.frame);
if (menuBar != null) {
menuBar.setVisible(true);
}
});
}
@@ -214,6 +215,11 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo
}
}
private static @Nullable JMenuBar getMenuBar(@NotNull JFrame menuBar) {
JRootPane rootPane = menuBar.getRootPane();
return rootPane == null ? null : rootPane.getJMenuBar();
}
private final @NotNull JFrame frame;
private final GlobalMenuLib.JRunnable onWindowReleased;
private final EventFilter eventFilter = new EventFilter();
@@ -421,9 +427,12 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo
}
if (!SHOW_SWING_MENU) {
ApplicationManager.getApplication().invokeLater(() -> {
EventQueue.invokeLater(() -> {
if (isEnabled) {
frame.getRootPane().getJMenuBar().setVisible(false);
JMenuBar menuBar = getMenuBar(frame);
if (menuBar != null) {
menuBar.setVisible(false);
}
}
});
}
@@ -457,7 +466,7 @@ public final class GlobalMenuLinux implements LinuxGlobalMenuEventHandler, Dispo
}
if (UISettings.getInstance().getShowMainMenu()) {
JMenuBar frameMenu = frame.getRootPane().getJMenuBar();
JMenuBar frameMenu = getMenuBar(frame);
if (frameMenu != null) {
frameMenu.setVisible(true);
}