commit d04c40622251557a9628b31270d870cc87d765c2
Author: Pavel Sanda <sa...@lyx.org>
Date: Wed Jul 5 20:45:26 2023 +0200
Hide multi-keystroke accelerators in Mac menu (bug 12693).
Patch from Juergen.
(cherry picked from commit fb43449c80d8fdd31eb79a70aec8f70083d48b2e)
---
src/frontends/qt4/Menus.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index a2505dc250..37f37a0b16 100644
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -1982,8 +1982,16 @@ static QString label(MenuItem const & mi)
}
QString const binding = mi.binding();
+#if defined(Q_OS_MAC)
+ // MacOS cannot display complex bindings, so hide those
+ // https://doc.qt.io/qt-6/macos-issues.html#menu-actions
+ // #12693
+ if (!binding.isEmpty() && !binding.contains(" "))
+ label += '\t' + binding;
+#else
if (!binding.isEmpty())
label += '\t' + binding;
+#endif
return label;
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
