From 86f22bd478e3345a63f1d7c9f09ae923088fdbb0 Mon Sep 17 00:00:00 2001
From: Aydar Mukhametzyanov <aydar.mukhametzyanov@jetbrains.com>
Date: Tue, 21 Feb 2023 11:29:40 +0100
Subject: [PATCH] IDEA-312894 Consider showMainMenu setting for Main Menu
 visibility

GitOrigin-RevId: ea38d55999325ff3773e5aabe4881edca5a8da12
---
 .../intellij/openapi/wm/impl/IdeRootPane.kt   | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.kt
index 03227aae20e4..24804f588dd3 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.kt
@@ -238,11 +238,7 @@ open class IdeRootPane internal constructor(frame: JFrame,
 
   private fun updateScreenState(isInFullScreen: () -> Boolean) {
     fullScreen = isInFullScreen()
-    val bar = jMenuBar
     if (helper is DecoratedHelper) {
-      if (bar != null) {
-        bar.isVisible = fullScreen
-      }
       val isCustomFrameHeaderVisible = !fullScreen || SystemInfo.isMac && !ToggleDistractionFreeModeAction.shouldMinimizeCustomHeader()
       helper.customFrameTitlePane.getComponent().isVisible = isCustomFrameHeaderVisible
       if (SystemInfo.isMac) {
@@ -253,14 +249,13 @@ open class IdeRootPane internal constructor(frame: JFrame,
       val shouldMinimize = ToggleDistractionFreeModeAction.shouldMinimizeCustomHeader()
       val isNewToolbar = ExperimentalUI.isNewUI()
 
-      if (bar != null) {
-        bar.isVisible = fullScreen || !isMenuButtonInToolbar || shouldMinimize && isNewToolbar
-      }
       if (toolbar != null) {
         val uiSettings = UISettings.shadowInstance
          toolbar!!.isVisible = !fullScreen && ((!shouldMinimize && isNewToolbar && !isToolbarInHeader(uiSettings)) || (!isNewToolbar && uiSettings.showMainToolbar))
       }
     }
+
+    updateMainMenuVisibility()
   }
 
   override fun createRootLayout(): LayoutManager {
@@ -397,13 +392,18 @@ open class IdeRootPane internal constructor(frame: JFrame,
 
   private fun updateMainMenuVisibility() {
     val uiSettings = UISettings.shadowInstance
-    if (uiSettings.presentationMode || IdeFrameDecorator.isCustomDecorationActive()) {
-      return
-    }
-
     val globalMenuVisible = SystemInfoRt.isLinux && GlobalMenuLinux.isPresented()
+    val shouldMinimize = ToggleDistractionFreeModeAction.shouldMinimizeCustomHeader()
+    val isNewToolbar = ExperimentalUI.isNewUI()
+
     // don't show swing-menu when global (system) menu presented
-    val visible = SystemInfo.isMacSystemMenu || !globalMenuVisible && uiSettings.showMainMenu && !isMenuButtonInToolbar
+    val visible = SystemInfo.isMacSystemMenu
+                  || fullScreen
+                  || (!IdeFrameDecorator.isCustomDecorationActive()
+                      && !globalMenuVisible
+                      && uiSettings.showMainMenu
+                      && (!isMenuButtonInToolbar || shouldMinimize && isNewToolbar))
+
     if (menuBar != null && visible != menuBar.isVisible) {
       menuBar.isVisible = visible
     }
@@ -453,7 +453,6 @@ open class IdeRootPane internal constructor(frame: JFrame,
     UIUtil.decorateWindowHeader(this)
     updateToolbarVisibility()
     updateStatusBarVisibility()
-    updateMainMenuVisibility()
     val frame = frame ?: return
     frame.background = JBColor.PanelBackground
     (frame.balloonLayout as? BalloonLayoutImpl)?.queueRelayout()