e8a41ed866
When a menu item's enabled state changes after -[QCocoaMenuDelegate menuWillOpen:] is invoked, i.e., during or after QMenu::aboutToShow() is emitted, that state change may not be taken into account. This is because the automatic menu validation, upon which Qt relies, is not made aware of any such change. By calling -[NSMenu update] when syncing the QPA menu item, we induce Cocoa to invoke -[QCocoaMenuDelegate validateMenuItem:] and ensure that previously synced items, whose state may have changed, will be properly updated. This, however, has a small side effect, namely that menu-holding items will also go through the automatic menu enabling path and may appear disabled since, until now, they were not properly configured. In order to solve this, we set the action on those items as well, and make sure that both of QCocoaMenuDelegate's relevant methods, validateMenuItem: and itemFired:, properly process menu-holding items. Menurama manual test updated accordingly. Change-Id: I62f955538b8be09b8494ea0ce87fca7910148d38 Task-number: QTBUG-56850 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
298 lines
8.2 KiB
XML
298 lines
8.2 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<ui version="4.0">
|
|
<class>MainWindow</class>
|
|
<widget class="QMainWindow" name="MainWindow">
|
|
<property name="geometry">
|
|
<rect>
|
|
<x>0</x>
|
|
<y>0</y>
|
|
<width>429</width>
|
|
<height>251</height>
|
|
</rect>
|
|
</property>
|
|
<property name="windowTitle">
|
|
<string>MainWindow</string>
|
|
</property>
|
|
<widget class="QWidget" name="centralWidget">
|
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
|
<item>
|
|
<layout class="QVBoxLayout" name="verticalLayout">
|
|
<property name="spacing">
|
|
<number>24</number>
|
|
</property>
|
|
<item>
|
|
<widget class="QLabel" name="label">
|
|
<property name="text">
|
|
<string>The "Help" menu should NOT be visible.
|
|
|
|
Click on "Dynamic Stuff" then move left and right to other menus. Disabled items should remain that way.</string>
|
|
</property>
|
|
<property name="scaledContents">
|
|
<bool>false</bool>
|
|
</property>
|
|
<property name="alignment">
|
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
|
</property>
|
|
<property name="wordWrap">
|
|
<bool>true</bool>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QCheckBox" name="checkBox">
|
|
<property name="text">
|
|
<string>Enable "Stuff" Menu</string>
|
|
</property>
|
|
<property name="checked">
|
|
<bool>true</bool>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QPushButton" name="pushButton">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="text">
|
|
<string>Populate Dynamic Submenu</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
<widget class="QMenuBar" name="menuBar">
|
|
<property name="geometry">
|
|
<rect>
|
|
<x>0</x>
|
|
<y>0</y>
|
|
<width>429</width>
|
|
<height>22</height>
|
|
</rect>
|
|
</property>
|
|
<widget class="QMenu" name="menuStuff">
|
|
<property name="title">
|
|
<string>Stuff</string>
|
|
</property>
|
|
<widget class="QMenu" name="menuSubmenu">
|
|
<property name="title">
|
|
<string>Submenu</string>
|
|
</property>
|
|
<widget class="QMenu" name="menuMore_Submenu_2">
|
|
<property name="title">
|
|
<string>More Submenu</string>
|
|
</property>
|
|
<addaction name="actionMOARH"/>
|
|
</widget>
|
|
<addaction name="actionWith_More_Stuff"/>
|
|
<addaction name="menuMore_Submenu_2"/>
|
|
</widget>
|
|
<widget class="QMenu" name="menuDisabled_Submenu">
|
|
<property name="enabled">
|
|
<bool>false</bool>
|
|
</property>
|
|
<property name="title">
|
|
<string>Disabled Submenu</string>
|
|
</property>
|
|
<widget class="QMenu" name="menuMore_Submenu">
|
|
<property name="title">
|
|
<string>More Submenu</string>
|
|
</property>
|
|
<addaction name="actionShould_be_Disabled_Too"/>
|
|
</widget>
|
|
<addaction name="actionShould_be_Disabled"/>
|
|
<addaction name="menuMore_Submenu"/>
|
|
</widget>
|
|
<addaction name="actionItem"/>
|
|
<addaction name="menuSubmenu"/>
|
|
<addaction name="actionDisabled_Item"/>
|
|
<addaction name="menuDisabled_Submenu"/>
|
|
</widget>
|
|
<widget class="QMenu" name="menuDisabled_Stuff">
|
|
<property name="enabled">
|
|
<bool>false</bool>
|
|
</property>
|
|
<property name="title">
|
|
<string>Disabled Stuff</string>
|
|
</property>
|
|
<widget class="QMenu" name="menuSubmenu_2">
|
|
<property name="title">
|
|
<string>Disabled Submenu</string>
|
|
</property>
|
|
<widget class="QMenu" name="menuSubsubmenu">
|
|
<property name="title">
|
|
<string>Disabled Subsubmenu</string>
|
|
</property>
|
|
<addaction name="actionWith_its_own_Stuff"/>
|
|
</widget>
|
|
<addaction name="actionMore_Disabled_Stuff"/>
|
|
<addaction name="menuSubsubmenu"/>
|
|
</widget>
|
|
<addaction name="actionItem_2"/>
|
|
<addaction name="menuSubmenu_2"/>
|
|
</widget>
|
|
<widget class="QMenu" name="menuShould_NOT_Be_Visible">
|
|
<property name="title">
|
|
<string>Should NOT Be Visible</string>
|
|
</property>
|
|
<addaction name="actionAbout"/>
|
|
</widget>
|
|
<widget class="QMenu" name="menuHelp">
|
|
<property name="title">
|
|
<string>Help</string>
|
|
</property>
|
|
<addaction name="actionAbout_Qt"/>
|
|
</widget>
|
|
<widget class="QMenu" name="menuDynamic_Stuff">
|
|
<property name="title">
|
|
<string>Dynamic Stuff</string>
|
|
</property>
|
|
<widget class="QMenu" name="menuAfter_aboutToShow">
|
|
<property name="title">
|
|
<string>Populated After aboutToShow()</string>
|
|
</property>
|
|
</widget>
|
|
<widget class="QMenu" name="menuOn_Click">
|
|
<property name="title">
|
|
<string>Click Button to Populate</string>
|
|
</property>
|
|
</widget>
|
|
<widget class="QMenu" name="menuPopulated_by_Timer">
|
|
<property name="title">
|
|
<string>Populated by Timer</string>
|
|
</property>
|
|
</widget>
|
|
<addaction name="menuOn_Click"/>
|
|
<addaction name="menuAfter_aboutToShow"/>
|
|
<addaction name="menuPopulated_by_Timer"/>
|
|
</widget>
|
|
<widget class="QMenu" name="menuFile">
|
|
<property name="title">
|
|
<string>File</string>
|
|
</property>
|
|
<addaction name="actionNew"/>
|
|
<addaction name="actionNo_Empty_Spaces_Below"/>
|
|
<addaction name="actionQuit"/>
|
|
</widget>
|
|
<addaction name="menuFile"/>
|
|
<addaction name="menuStuff"/>
|
|
<addaction name="menuDisabled_Stuff"/>
|
|
<addaction name="menuShould_NOT_Be_Visible"/>
|
|
<addaction name="menuDynamic_Stuff"/>
|
|
<addaction name="menuHelp"/>
|
|
</widget>
|
|
<widget class="QToolBar" name="mainToolBar">
|
|
<attribute name="toolBarArea">
|
|
<enum>TopToolBarArea</enum>
|
|
</attribute>
|
|
<attribute name="toolBarBreak">
|
|
<bool>false</bool>
|
|
</attribute>
|
|
</widget>
|
|
<widget class="QStatusBar" name="statusBar"/>
|
|
<action name="actionWith_More_Stuff">
|
|
<property name="text">
|
|
<string>With More Stuff</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionDisabled_Item">
|
|
<property name="enabled">
|
|
<bool>false</bool>
|
|
</property>
|
|
<property name="text">
|
|
<string>Disabled Item</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionItem">
|
|
<property name="text">
|
|
<string>Item</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionShould_be_Disabled">
|
|
<property name="text">
|
|
<string>Should be Disabled</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionShould_be_Disabled_Too">
|
|
<property name="text">
|
|
<string>Should be Disabled Too</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionMOARH">
|
|
<property name="text">
|
|
<string>MOAR!!</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionItem_2">
|
|
<property name="enabled">
|
|
<bool>true</bool>
|
|
</property>
|
|
<property name="text">
|
|
<string>Disabled Item</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionMore_Disabled_Stuff">
|
|
<property name="text">
|
|
<string>More Disabled Stuff</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionWith_its_own_Stuff">
|
|
<property name="text">
|
|
<string>With its own Disabled Stuff</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionAbout">
|
|
<property name="text">
|
|
<string>About</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionAbout_Qt">
|
|
<property name="text">
|
|
<string>About Qt</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionQuit">
|
|
<property name="text">
|
|
<string>Exit</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionNew">
|
|
<property name="text">
|
|
<string>New...</string>
|
|
</property>
|
|
</action>
|
|
<action name="actionNo_Empty_Spaces_Below">
|
|
<property name="text">
|
|
<string>No Empty Spaces Below</string>
|
|
</property>
|
|
</action>
|
|
</widget>
|
|
<layoutdefault spacing="6" margin="11"/>
|
|
<resources/>
|
|
<connections>
|
|
<connection>
|
|
<sender>checkBox</sender>
|
|
<signal>toggled(bool)</signal>
|
|
<receiver>MainWindow</receiver>
|
|
<slot>enableStuffMenu(bool)</slot>
|
|
<hints>
|
|
<hint type="sourcelabel">
|
|
<x>62</x>
|
|
<y>94</y>
|
|
</hint>
|
|
<hint type="destinationlabel">
|
|
<x>72</x>
|
|
<y>73</y>
|
|
</hint>
|
|
</hints>
|
|
</connection>
|
|
</connections>
|
|
<slots>
|
|
<slot>enableStuffMenu(bool)</slot>
|
|
</slots>
|
|
</ui>
|