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

linux-menu: add toggle swing-menu action

Browse Source 
"workaround" for IDEA-200678 Native menu bar on Ubuntu Linux: main menu disappears after any dialog invocation if the ‘windows-style’
This commit is contained in:
bocha
2019-02-05 22:22:19 +03:00
committed by Artem Bochkarev
parent f3db25360f
commit 1427658f01
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java
+19
View File
@@ -8,7 +8,9 @@ import com.intellij.execution.util.ExecUtil;
import com.intellij.ide.IdeEventQueue;
import com.intellij.ide.plugins.PluginManager;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.impl.ActionMenu;
import com.intellij.openapi.actionSystem.impl.ActionMenuItem;
import com.intellij.openapi.actionSystem.impl.StubItem;
@@ -102,6 +104,10 @@ interface GlobalMenuLib extends Library {
}
public class GlobalMenuLinux implements GlobalMenuLib.EventHandler, Disposable {
private static final String TOGGLE_SWING_MENU_ACTION_NAME = "Toggle Global Menu integration";
private static final String TOGGLE_SWING_MENU_ACTION_DESC = "Enable/disable global menu integration (in all frames)";
private static final String TOGGLE_SWING_MENU_ACTION_ID = "ToggleGlobalLinuxMenu";
private static final SimpleDateFormat ourDtf = new SimpleDateFormat("hhmmss.SSS"); // for debug only
private static final boolean TRACE_SYSOUT = Boolean.getBoolean("linux.native.menu.debug.trace.sysout");
private static final boolean TRACE_ENABLED = Boolean.getBoolean("linux.native.menu.debug.trace.enabled");
@@ -192,6 +198,19 @@ public class GlobalMenuLinux implements GlobalMenuLib.EventHandler, Disposable {
final Thread glibMain = new Thread(()->ourLib.runMainLoop(ourGLogger, ourOnAppmenuServiceAppeared, ourOnAppmenuServiceVanished), "GlobalMenuLinux loop");
glibMain.start();
}
// register toggle-swing-menu action (to be able to enable swing menu when system applet is died)
final ActionManager am = ActionManager.getInstance();
final AnAction toggleSwingMenu = new AnAction(TOGGLE_SWING_MENU_ACTION_NAME, TOGGLE_SWING_MENU_ACTION_DESC, null) {
boolean enabled = false;
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
for (GlobalMenuLinux gml: ourInstances.values())
gml.toggle(enabled);
enabled = !enabled;
}
};
am.registerAction(TOGGLE_SWING_MENU_ACTION_ID, toggleSwingMenu);
} else {
ourGLogger = null;
ourUpdateAllRoots = null;