diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2022-07-04 11:09:55 +0200 |
|---|---|---|
| committer | intellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com> | 2022-07-06 10:08:36 +0000 |
| commit | 67b8ce334a53cf3d86429d6673d81057b14e0a38 (patch) | |
| tree | 688d187f6a1313f357d8807ab0a0c0c0b2a92370 | |
| parent | 48326db95666d3b41127cd582628346f9342e46e (diff) | |
| download | idea-67b8ce334a53cf3d86429d6673d81057b14e0a38.tar.gz | |
Disable use of screen menu library on macOS High Sierra (IDEA-296489)
(cherry picked from commit 4c1a176dbbbac3a8816abd680565ab0a9402fca7)
IJ-CR-26738
GitOrigin-RevId: 56c1697044ca10a997f9277c8e2162d03aa93ffe
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | platform/platform-api/src/com/intellij/ui/mac/screenmenu/Menu.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 5e640a6eff50..ab6e38c644f8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ edu/dependencies/.gradle edu/dependencies/build native/**/build/ stale_outputs_checked -/android
\ No newline at end of file +/android +/tools/intellij.ide.starter
\ No newline at end of file diff --git a/platform/platform-api/src/com/intellij/ui/mac/screenmenu/Menu.java b/platform/platform-api/src/com/intellij/ui/mac/screenmenu/Menu.java index aef61e0ff058..aa4d012813cb 100644 --- a/platform/platform-api/src/com/intellij/ui/mac/screenmenu/Menu.java +++ b/platform/platform-api/src/com/intellij/ui/mac/screenmenu/Menu.java @@ -274,7 +274,7 @@ public class Menu extends MenuItem { IS_ENABLED = false; - if (!SystemInfo.isMac) return false; + if (!SystemInfo.isMacOSMojave) return false; if (!Boolean.getBoolean("jbScreenMenuBar.enabled")) return false; if (Boolean.getBoolean("apple.laf.useScreenMenuBar")) { Logger.getInstance(Menu.class).info("apple.laf.useScreenMenuBar==true, default screen menu implementation will be used"); |