Update actions

Author: CrSjimo

src/libs/application/uishell/src/qml/HomeWindow.qml

@@ -23,7 +23,7 @@ Window {
     property var recoveryFilesModel: null
     property var navigationActionsModel: null
     property var toolActionsModel: null
-    property var macosMenusModel: null
+    property var menusModel: null
 
     readonly property bool isMacOS: Qt.platform.os === "osx" || Qt.platform.os === "macos"
 
@@ -58,6 +58,7 @@ Window {
             windowAgent.setSystemButton(WindowAgent.Minimize, minimizeSystemButton)
             windowAgent.setSystemButton(WindowAgent.Maximize, maximizeSystemButton)
             windowAgent.setSystemButton(WindowAgent.Close, closeSystemButton)
+            windowAgent.setHitTestVisible(menuBar)
             windowAgent.setHitTestVisible(Overlay.overlay)
         }
     }
@@ -322,35 +323,56 @@ Window {
         property bool framelessSetup: false
     }
 
-    MenuBar {
-        id: menuBar
-        visible: window.isMacOS
-        Instantiator {
-            model: window.macosMenusModel
-            onObjectAdded: (index, object) => {
-                if (object instanceof Menu) {
-                    menuBar.insertMenu(index, object)
-                } else {
-                    throw new TypeError("Unsupported menu type")
-                }
-            }
-            onObjectRemoved: (index, object) => {
-                if (object instanceof Menu) {
-                    menuBar.removeMenu(object)
-                } else {
-                    throw new TypeError("Unsupported menu type")
-                }
-            }
-        }
-    }
-
     Item {
         id: titleBarArea
         width: window.width
         height: !window.isMacOS ? 36 : 28
         visible: windowAgent.framelessSetup && (!window.isMacOS || window.visibility !== Window.FullScreen)
         z: 1
         Accessible.role: Accessible.TitleBar
+        Rectangle {
+            id: menuBarBackground
+            width: parent.width
+            height: menuBar.height
+            visible: menuBar.height !== 0
+            anchors.top: parent.top
+            anchors.topMargin: menuBar.anchors.topMargin
+            color: Theme.backgroundQuaternaryColor
+        }
+        MenuBar {
+            id: menuBar
+            anchors.left: parent.left
+            anchors.top: parent.top
+            anchors.topMargin: activeFocus || menus.some(menu => menu.visible) || children.some(item => item.activeFocus) ? 0 : -height
+            ThemedItem.backgroundLevel: SVS.BL_Quaternary
+            Behavior on anchors.topMargin {
+                id: topMarginBehavior
+                enabled: false
+                NumberAnimation {
+                    duration: Theme.visualEffectAnimationDuration
+                    easing.type: Easing.OutCubic
+                }
+            }
+            Component.onCompleted: Qt.callLater(() => topMarginBehavior.enabled = true)
+            Instantiator {
+                model: window.menusModel
+                onObjectAdded: (index, object) => {
+                    if (object instanceof Menu) {
+                        console.log(object)
+                        menuBar.insertMenu(index, object)
+                    } else {
+                        throw new TypeError("Unsupported menu type")
+                    }
+                }
+                onObjectRemoved: (index, object) => {
+                    if (object instanceof Menu) {
+                        menuBar.removeMenu(object)
+                    } else {
+                        throw new TypeError("Unsupported menu type")
+                    }
+                }
+            }
+        }
         RowLayout {
             anchors.right: parent.right
             visible: !window.isMacOS

src/plugins/coreplugin/CMakeLists.txt

@@ -27,13 +27,6 @@ qak_add_action_extension(
     res/core_actions.xml
 )
 list(APPEND _src ${_core_actions_src})
-if(APPLE)
-    qak_add_action_extension(
-        _core_macos_actions_src
-        res/core_macos_actions.xml
-    )
-    list(APPEND _src ${_core_macos_actions_src})
-endif()
 
 qm_configure_target(${PROJECT_NAME}
     SOURCES ${_src}

src/plugins/coreplugin/internal/coreplugin.cpp

@@ -70,12 +70,6 @@ static auto getCoreActionExtension() {
     return QAK_STATIC_ACTION_EXTENSION(core_actions);
 }
 
-#ifdef Q_OS_MAC
-static auto getCoreMacOSActionExtension() {
-    return QAK_STATIC_ACTION_EXTENSION(core_macos_actions);
-}
-#endif
-
 namespace Core::Internal {
 
     Q_STATIC_LOGGING_CATEGORY(lcCorePlugin, "diffscope.core.coreplugin")
@@ -319,9 +313,6 @@ namespace Core::Internal {
 
     void CorePlugin::initializeActions() {
         CoreInterface::actionRegistry()->addExtension(::getCoreActionExtension());
-#ifdef Q_OS_MAC
-        CoreInterface::actionRegistry()->addExtension(::getCoreMacOSActionExtension());
-#endif
 
         // TODO: move to icon manifest later
         const auto addIcon = [&](const QString &id, const QString &iconName) {

src/plugins/coreplugin/qml/actions/ProjectWindowNavigatorAddOnActions.qml

@@ -46,6 +46,7 @@ ActionCollection {
                         checked: d.addOn.windowHandle === modelData
                         onTriggered: () => {
                             d.addOn.raiseWindow(modelData)
+                            checked = d.addOn.windowHandle === modelData
                         }
                     }
                 }

src/plugins/coreplugin/qml/windows/HomeWindow.qml

@@ -58,15 +58,15 @@ HomeWindow {
             }
         }
     }
-    macosMenusModel: ObjectModel {
+    menusModel: ObjectModel {
         property ActionInstantiator instantiator: ActionInstantiator {
-            actionId: homeWindow.isMacOS ? "core.homeMenu" : ""
+            actionId: "core.homeMenu"
             context: homeWindow.windowHandle.actionContext
             onObjectAdded: (index, object) => {
-                homeWindow.macosMenusModel.insert(index, object)
+                homeWindow.menusModel.insert(index, object)
             }
             onObjectRemoved: (index, object) => {
-                homeWindow.macosMenusModel.remove(index)
+                homeWindow.menusModel.remove(index)
             }
         }
     }

src/plugins/coreplugin/res/core_actions.xml

@@ -372,6 +372,24 @@
             </menu>
             <menu id="core.help" />
         </menu>
+
+
+        <menu id="core.homeMenu">
+            <menu id="core.homeFile" text="&amp;File">
+                <group id="core.fileOpenActions" />
+                <group id="core.preferenceActions" />
+                <action id="core.exit" />
+            </menu>
+            <menu id="core.homeView" text="&amp;View">
+                <action id="core.home.recentFiles" />
+                <action id="core.home.recoveryFiles" />
+                <separator />
+                <action id="core.home.gridView" />
+                <action id="core.home.listView" />
+            </menu>
+            <menu id="core.window" />
+            <menu id="core.help" />
+        </menu>
     </layouts>
 
 </actionExtension>