From: Scott Kostyshak Date: Fri, 21 Feb 2014 15:26:36 +0000 (-0500) Subject: Submenus now expand even if all items are disabled X-Git-Tag: 2.2.0alpha1~1752 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d449e7e64e1f074fcd9621f3675796cbac9d2656;p=features.git Submenus now expand even if all items are disabled As stated in the Apple HIG[1] (via JMarc): Ensure that a submenu’s title is undimmed even when all its commands are unavailable. As with menu titles, it’s important for users to be able to view a submenu’s contents, even if none of them are available in the current context. [1] https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/AppleHIGuidelines/Menus/Menus.html#//apple_ref/doc/uid/TP30000356-TP6 --- diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index 707251dfbb..7fa219b394 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -418,8 +418,7 @@ void MenuDefinition::addWithStatusCheck(MenuItem const & i) // Only these kind of items affect the status of the submenu if ((cit->kind() == MenuItem::Command || cit->kind() == MenuItem::Submenu - || cit->kind() == MenuItem::Help) - && cit->status().enabled()) { + || cit->kind() == MenuItem::Help)) { enabled = true; break; }