From 29dc67d96b0f3a2af9456a08bceb7281ea6e3871 Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Thu, 22 Jan 2026 00:35:30 +0100 Subject: [PATCH] Fix menu behaviour on Linux. --- app/qml/TerminalWindow.qml | 15 +++------------ app/qml/main.qml | 5 ----- app/qml/menus/FullContextMenu.qml | 4 ---- app/qml/menus/WindowMenu.qml | 4 ---- qmltermwidget | 2 +- 5 files changed, 4 insertions(+), 26 deletions(-) diff --git a/app/qml/TerminalWindow.qml b/app/qml/TerminalWindow.qml index be8d1de..9a75a77 100644 --- a/app/qml/TerminalWindow.qml +++ b/app/qml/TerminalWindow.qml @@ -46,7 +46,7 @@ ApplicationWindow { Loader { id: qtquickMenuLoader - active: !appSettings.isMacOS && (appSettings.showMenubar && !fullscreen) + active: appSettings.isMacOS || (appSettings.showMenubar && !fullscreen) sourceComponent: WindowMenu { } } @@ -56,23 +56,14 @@ ApplicationWindow { title: terminalTabs.currentTitle - Action { - id: showMenubarAction - text: qsTr("Show Menubar") - enabled: !appSettings.isMacOS - shortcut: "Ctrl+Shift+M" - checkable: true - checked: appSettings.showMenubar - onTriggered: appSettings.showMenubar = !appSettings.showMenubar - } Action { id: fullscreenAction text: qsTr("Fullscreen") enabled: !appSettings.isMacOS shortcut: "Alt+F11" - onTriggered: appSettings.fullscreen = !appSettings.fullscreen + onTriggered: fullscreen = !fullscreen checkable: true - checked: appSettings.fullscreen + checked: fullscreen } Action { id: newWindowAction diff --git a/app/qml/main.qml b/app/qml/main.qml index c82f8f1..9b3b4d0 100644 --- a/app/qml/main.qml +++ b/app/qml/main.qml @@ -46,11 +46,6 @@ QtObject { property ListModel windowsModel: ListModel { } - property Loader globalMenuLoader: Loader { - active: appSettings.isMacOS - sourceComponent: OSXMenu { } - } - function createWindow() { var window = windowComponent.createObject(null) if (!window) diff --git a/app/qml/menus/FullContextMenu.qml b/app/qml/menus/FullContextMenu.qml index 3cb3aa8..0d2ad9f 100644 --- a/app/qml/menus/FullContextMenu.qml +++ b/app/qml/menus/FullContextMenu.qml @@ -64,10 +64,6 @@ Menu { action: fullscreenAction visible: fullscreenAction.enabled } - MenuItem { - action: showMenubarAction - visible: showMenubarAction.enabled - } MenuItem { action: zoomIn } diff --git a/app/qml/menus/WindowMenu.qml b/app/qml/menus/WindowMenu.qml index e3b9377..df2e94b 100644 --- a/app/qml/menus/WindowMenu.qml +++ b/app/qml/menus/WindowMenu.qml @@ -56,10 +56,6 @@ MenuBar { action: fullscreenAction visible: fullscreenAction.enabled } - MenuItem { - action: showMenubarAction - visible: showMenubarAction.enabled - } MenuItem { action: zoomIn } diff --git a/qmltermwidget b/qmltermwidget index 7dad24f..d86ebbc 160000 --- a/qmltermwidget +++ b/qmltermwidget @@ -1 +1 @@ -Subproject commit 7dad24fefb783508c5d0df52f6e7beac27d28173 +Subproject commit d86ebbc396ece6ed46b30eaa1ebead138ab7f2a4