Added workaround for QTBUG-119198 (Disabled menu item indistinguishable

from enabled one)
enz · Apr 25, 2024 · 3f6b6ff · 3f6b6ff
1 parent 106fe24
commit 3f6b6ff
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 53 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -8,6 +8,8 @@ Version 25.0-dev (master)
   in current position after program startup.
 * Don't support magic MIME type detection on Unix anymore, which was
   not reliable anyway and not working if installed via Flatpak.
+* Added workaround for QTBUG-119198 (Disabled menu item indistinguishable
+  from enabled one)
 * Compile QML sources into executable, which avoids problems of
   QML cache sometimes not being updated if installed via Flatpak.
 

diff --git a/pentobi/BoardContextMenu.qml b/pentobi/BoardContextMenu.qml
@@ -19,12 +19,12 @@ PentobiMenu {
                     qsTr("Move Annotation (%1)").arg(annotation)
     }
 
-    MenuItem {
+    PentobiMenuItem {
         enabled: moveNumber !== gameModel.moveNumber && ! isRated
         text: qsTr("Go to Move %1").arg(moveNumber)
         onTriggered: gameModel.gotoMove(moveNumber)
     }
-    MenuItem {
+    PentobiMenuItem {
         id: itemAnnotation
 
         onTriggered: {

diff --git a/pentobi/CMakeLists.txt b/pentobi/CMakeLists.txt
@@ -176,6 +176,7 @@ qt_add_qml_module(pentobi
       PentobiDialog.qml
       PentobiDialogButtonBox.qml
       PentobiMenu.qml
+      PentobiMenuItem.qml
       PentobiToolBar.qml
       PieceBase.qml
       PieceCallisto.qml

diff --git a/pentobi/Main.qml b/pentobi/Main.qml
@@ -48,6 +48,11 @@ ApplicationWindow {
                                         || analyzeGameModel.isRunning
     property bool showToolBar: true
 
+    // Enable workaround for QTBUG-119198 (Disabled menu item indistinguishable
+    // from enabled one)
+    property bool workaroundQtBug119198:
+        palette.buttonText == palette.disabled.buttonText
+
     minimumWidth: isDesktop ? 481 : 240
     minimumHeight: isDesktop ? 303 : 301
     color: theme.colorBackground

diff --git a/pentobi/MenuComputer.qml b/pentobi/MenuComputer.qml
@@ -9,16 +9,16 @@ import QtQuick.Controls
 PentobiMenu {
     title: qsTr("Computer")
 
-    MenuItem {
+    PentobiMenuItem {
         action: actionComputerSettings
     }
-    MenuItem {
+    PentobiMenuItem {
         action: actionPlay
     }
-    MenuItem {
+    PentobiMenuItem {
         action: actionPlaySingle
     }
-    MenuItem {
+    PentobiMenuItem {
         action: actionStop
     }
 }
diff --git a/pentobi/MenuEdit.qml b/pentobi/MenuEdit.qml
@@ -10,7 +10,7 @@ import "Main.js" as Logic
 PentobiMenu {
     title: qsTr("Edit")
 
-    MenuItem {
+    PentobiMenuItem {
         text: qsTr("Annotation…")
         enabled: gameModel.moveNumber > 0
         onTriggered: {
@@ -20,54 +20,54 @@ PentobiMenu {
         }
     }
     MenuSeparator { }
-    MenuItem {
+    PentobiMenuItem {
         text: qsTr("Make Main Variation")
         enabled: ! gameModel.isMainVar && ! isRated
         onTriggered: {
             gameModel.makeMainVar()
             Logic.showTemporaryMessage(qsTr("Made main variation"))
         }
     }
-    MenuItem {
+    PentobiMenuItem {
         //: Short for Move Variation Up
         text: qsTr("Variation Up")
         enabled: gameModel.hasPrevVar && ! isRated
         onTriggered: Logic.moveUpVar()
     }
-    MenuItem {
+    PentobiMenuItem {
         //: Short for Move Variation Down
         text: qsTr("Variation Down")
         enabled: gameModel.hasNextVar && ! isRated
         onTriggered: Logic.moveDownVar()
     }
-    MenuItem {
+    PentobiMenuItem {
         text: qsTr("Delete Variations")
         enabled: gameModel.hasVariations && ! isRated
         onTriggered: Logic.deleteAllVar()
     }
     MenuSeparator { }
-    MenuItem {
+    PentobiMenuItem {
         text: qsTr("Truncate")
         enabled: gameModel.canGoBackward && ! isRated
         onTriggered: Logic.truncate()
     }
-    MenuItem {
+    PentobiMenuItem {
         text: qsTr("Truncate Children")
         enabled: gameModel.canGoForward && ! isRated
         onTriggered: Logic.truncateChildren()
     }
-    MenuItem {
+    PentobiMenuItem {
         text: qsTr("Keep Position")
         enabled: ! gameModel.isBoardEmpty && (gameModel.canGoBackward || gameModel.canGoForward) && ! isRated
         onTriggered: Logic.keepOnlyPosition()
     }
-    MenuItem {
+    PentobiMenuItem {
         text: qsTr("Keep Subtree")
         enabled: gameModel.canGoBackward && gameModel.canGoForward && ! isRated
         onTriggered: Logic.keepOnlySubtree()
     }
     MenuSeparator { }
-    MenuItem {
+    PentobiMenuItem {
         text: qsTr("Setup Mode")
         checkable: true
         enabled: ! gameModel.canGoBackward && ! gameModel.canGoForward
@@ -83,7 +83,7 @@ PentobiMenu {
             }
         }
     }
-    MenuItem {
+    PentobiMenuItem {
         text: qsTr("Next Color")
         enabled: ! isRated
         onTriggered: {

diff --git a/pentobi/MenuGame.qml b/pentobi/MenuGame.qml
@@ -10,45 +10,45 @@ import "Main.js" as Logic
 PentobiMenu {
     title: qsTr("Game")
 
-    MenuItem {
+    PentobiMenuItem {
         action: actionNew
     }
-    MenuItem {
+    PentobiMenuItem {
         action: actionNewRated
     }
     MenuSeparator { }
-    Action {
+    PentobiMenuItem {
         text: qsTr("Game Variant…")
         onTriggered: gameVariantDialog.open()
     }
-    MenuItem {
+    PentobiMenuItem {
         action: actionGameInfo
     }
     MenuSeparator { }
-    MenuItem {
+    PentobiMenuItem {
         action: actionUndo
     }
-    MenuItem {
+    PentobiMenuItem {
         action: actionFindMove
     }
     MenuSeparator { }
-    MenuItem {
+    PentobiMenuItem {
         action: actionOpen
     }
     MenuRecentFiles { }
-    MenuItem {
+    PentobiMenuItem {
         action: actionSave
         enabled: actionSave.enabled && gameModel.file !== ""
     }
-    MenuItem {
+    PentobiMenuItem {
         action: actionSaveAs
     }
-    Action {
+    PentobiMenuItem {
         text: qsTr("Export Image…")
         onTriggered: exportImageDialog.open()
     }
     MenuSeparator { }
-    MenuItem {
+    PentobiMenuItem {
         action: actionQuit
     }
 }
diff --git a/pentobi/MenuGo.qml b/pentobi/MenuGo.qml
@@ -9,17 +9,17 @@ import QtQuick.Controls
 PentobiMenu {
     title: qsTr("Go")
 
-    MenuItem {
+    PentobiMenuItem {
         action: actionGotoMove
     }
-    MenuItem {
+    PentobiMenuItem {
         action: actionBackToMainVar
     }
-    MenuItem {
+    PentobiMenuItem {
         action: actionBeginningOfBranch
     }
     MenuSeparator { }
-    MenuItem {
+    PentobiMenuItem {
         action: actionNextComment
     }
 }
diff --git a/pentobi/MenuHelp.qml b/pentobi/MenuHelp.qml
@@ -9,10 +9,10 @@ import QtQuick.Controls
 PentobiMenu {
     title: qsTr("Help")
 
-    MenuItem {
+    PentobiMenuItem {
         action: actionHelp
     }
-    Action {
+    PentobiMenuItem {
         text: qsTr("About Pentobi")
         onTriggered: aboutDialog.open()
     }

diff --git a/pentobi/MenuRecentFiles.qml b/pentobi/MenuRecentFiles.qml
@@ -29,63 +29,63 @@ PentobiMenu {
     }
 
     // Instantiator in Menu doesn't work reliably with Qt 5.11 or 5.12.0 alpha
-    MenuItem {
+    PentobiMenuItem {
         visible: recentFiles.entries.length > 0
         // Invisible menu item still use space in Qt 5.11
         height: visible ? implicitHeight : 0
         text: getText(recentFiles.entries, 0)
         onTriggered: openFile(0)
     }
-    MenuItem {
+    PentobiMenuItem {
         visible: recentFiles.entries.length > 1
         height: visible ? implicitHeight : 0
         text: getText(recentFiles.entries, 1)
         onTriggered: openFile(1)
     }
-    MenuItem {
+    PentobiMenuItem {
         visible: recentFiles.entries.length > 2
         height: visible ? implicitHeight : 0
         text: getText(recentFiles.entries, 2)
         onTriggered: openFile(2)
     }
-    MenuItem {
+    PentobiMenuItem {
         visible: recentFiles.entries.length > 3
         height: visible ? implicitHeight : 0
         text: getText(recentFiles.entries, 3)
         onTriggered: openFile(3)
     }
-    MenuItem {
+    PentobiMenuItem {
         visible: recentFiles.entries.length > 4
         height: visible ? implicitHeight : 0
         text: getText(recentFiles.entries, 4)
         onTriggered: openFile(4)
     }
-    MenuItem {
+    PentobiMenuItem {
         visible: recentFiles.entries.length > 5
         height: visible ? implicitHeight : 0
         text: getText(recentFiles.entries, 5)
         onTriggered: openFile(5)
     }
-    MenuItem {
+    PentobiMenuItem {
         visible: recentFiles.entries.length > 6
         height: visible ? implicitHeight : 0
         text: getText(recentFiles.entries, 6)
         onTriggered: openFile(6)
     }
-    MenuItem {
+    PentobiMenuItem {
         visible: recentFiles.entries.length > 7
         height: visible ? implicitHeight : 0
         text: getText(recentFiles.entries, 7)
         onTriggered: openFile(7)
     }
-    MenuItem {
+    PentobiMenuItem {
         visible: recentFiles.entries.length > 8
         height: visible ? implicitHeight : 0
         text: getText(recentFiles.entries, 8)
         onTriggered: openFile(8)
     }
     MenuSeparator { }
-    Action {
+    PentobiMenuItem {
         //: Menu item for clearing the recent files list
         text: qsTr("Clear List")
         // recentFiles.clear() must be called after menu is closed because it

diff --git a/pentobi/MenuTools.qml b/pentobi/MenuTools.qml
@@ -10,22 +10,22 @@ import "Main.js" as Logic
 PentobiMenu {
     title: qsTr("Tools")
 
-    MenuItem {
+    PentobiMenuItem {
         text: qsTr("Rating")
         onTriggered: Logic.rating()
     }
-    Action {
+    PentobiMenuItem {
         enabled: ! isRated && ratingModel.numberGames > 0
         text: qsTr("Clear Rating")
         onTriggered: Logic.clearRating()
     }
     MenuSeparator { }
-    Action {
+    PentobiMenuItem {
         enabled: ! isRated && (gameModel.canGoBackward || gameModel.canGoForward)
         text: qsTr("Analyze Game…")
         onTriggered: analyzeDialog.open()
     }
-    Action {
+    PentobiMenuItem {
         enabled: analyzeGameModel.elements.length !== 0
         text: qsTr("Clear Analysis")
         onTriggered: {

diff --git a/pentobi/MenuView.qml b/pentobi/MenuView.qml
@@ -10,11 +10,11 @@ import QtQuick.Window
 PentobiMenu {
     title: qsTr("View")
 
-    Action {
+    PentobiMenuItem {
         text: qsTr("Appearance")
         onTriggered: appearanceDialog.open()
     }
-    MenuItem {
+    PentobiMenuItem {
         visible: isDesktop
         // Invisible menu item still use space in Qt 5.11
         height: visible ? implicitHeight : 0
@@ -23,10 +23,10 @@ PentobiMenu {
         checked: rootWindow.showToolBar
         onTriggered: rootWindow.showToolBar = checked
     }
-    MenuItem {
+    PentobiMenuItem {
         action: actionComment
     }
-    MenuItem {
+    PentobiMenuItem {
         action: actionFullscreen
     }
 }
diff --git a/pentobi/PentobiMenuItem.qml b/pentobi/PentobiMenuItem.qml
@@ -0,0 +1,14 @@
+//-----------------------------------------------------------------------------
+/** @file pentobi/PentobiMenuItem.qml
+    @author Markus Enzenberger
+    @copyright GNU General Public License version 3 or later */
+//-----------------------------------------------------------------------------
+
+import QtQuick
+import QtQuick.Controls
+
+MenuItem {
+    // Add extra transparency as a workaround for QTBUG-119198 (Disabled menu
+    // item indistinguishable from enabled one).
+    opacity: workaroundQtBug119198 && ! enabled ? 0.65 : 1
+}
diff --git a/pentobi/RatingDialog.qml b/pentobi/RatingDialog.qml
@@ -169,7 +169,7 @@ PentobiDialog {
 
                 relativeWidth: 14
 
-                MenuItem {
+                PentobiMenuItem {
                     text: qsTr("Open Game %1").arg(
                                 ratingModel.getGameNumber(menu.row - 1))
                     onTriggered: {