From 858f8150addd300a6ce12b7f568145022163b8b8 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sun, 19 Jan 2025 12:06:35 -0500
Subject: [PATCH] Enable access key underline of menu bar items when focused

* Fixes #7325

Qt 5.x defaults to always show mnemonic underlines in menus. Qt 6.x fixes this, but we can't port the fix since it relies on private theme namespaces. Anyway, to get around this, simply check if the widget is a menubar and focused. If so, we draw the underlines. Only applies when the user actually presses ALT so this is desired behavior.

NOTE: Underlines in menus will disappear once you focus on the menu, still working on this
---
 share/translations/keepassxc_en.ts |  8 ++++----
 src/gui/MainWindow.ui              |  2 +-
 src/gui/styles/base/BaseStyle.cpp  | 20 +++++++++++++++++++-
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
index 301d888ff..f20b60b7b 100644
--- a/share/translations/keepassxc_en.ts
+++ b/share/translations/keepassxc_en.ts
@@ -5631,10 +5631,6 @@ Are you sure you want to continue with this file?</source>
         <source>&amp;Tools</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Theme</source>
         <translation type="unfinished"></translation>
@@ -6300,6 +6296,10 @@ Expect some bugs and minor issues, this version is meant for testing purposes.</
         <source>E&amp;xpire Entry…</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Clear SSH Agent</source>
         <translation type="unfinished"></translation>
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index 283bfd999..798728c58 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -377,7 +377,7 @@
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
-     <string>View</string>
+     <string>&amp;View</string>
     </property>
     <widget class="QMenu" name="menuTheme">
      <property name="title">
diff --git a/src/gui/styles/base/BaseStyle.cpp b/src/gui/styles/base/BaseStyle.cpp
index 8fa8f64bb..fca1bc923 100644
--- a/src/gui/styles/base/BaseStyle.cpp
+++ b/src/gui/styles/base/BaseStyle.cpp
@@ -29,6 +29,7 @@
 #include <QFile>
 #include <QHeaderView>
 #include <QListView>
+#include <QMenuBar>
 #include <QPainter>
 #include <QPainterPath>
 #include <QPoint>
@@ -4694,7 +4695,24 @@ int BaseStyle::styleHint(StyleHint hint,
     case SH_WindowFrame_Mask:
         return 0;
     case SH_UnderlineShortcut: {
-        return false;
+#if defined(Q_OS_WIN) or defined(Q_OS_LINUX)
+        // Only show underline shortcuts if the user focused with ALT (Win/Linux only)
+        auto menu = qobject_cast<const QMenu*>(widget);
+        if (menu) {
+            auto p = menu->parentWidget();
+            while (p) {
+                auto mb = qobject_cast<QMenuBar*>(p);
+                if (mb && mb->hasFocus()) {
+                    return 1;
+                }
+                p = p->parentWidget();
+            }
+        }
+        auto mb = qobject_cast<const QMenuBar*>(widget);
+        return (mb && mb->hasFocus()) ? 1 : 0;
+#else
+        return 0;
+#endif
     }
     case SH_Widget_Animate:
         return 1;