path: root/src/plugins/platforms/ios/qiosmenu.h
diff options
authorRichard Moe Gustavsen <>2014-09-24 13:25:29 +0200
committerRichard Moe Gustavsen <>2014-09-25 15:35:56 +0200
commitee31bc59bec8b63e681f7fda0e67819458994880 (patch)
tree69d3c8994fd46afc790e944975d79af8ca4d7100 /src/plugins/platforms/ios/qiosmenu.h
parent4dffab4c39f686f4dc3136adcd838f3591ca0bfc (diff)
iOS: don't show popup on call to setVisible
It turns out that setting visibility means whether or not the menu should appear visible in a parent menu, and not to actually show or hide the popup. This means that the only way to show a popup is to call showPopup, which also makes it simpler since we then always get a parent window as argument that we can activate and get a focus object from. Change-Id: Ie3866b5664294f9aa4d694fa422e8116e9c75ced Reviewed-by: Tor Arne Vestbø <>
Diffstat (limited to 'src/plugins/platforms/ios/qiosmenu.h')
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/ios/qiosmenu.h b/src/plugins/platforms/ios/qiosmenu.h
index 37578cdb24..16e1ee5d1f 100644
--- a/src/plugins/platforms/ios/qiosmenu.h
+++ b/src/plugins/platforms/ios/qiosmenu.h
@@ -126,7 +126,6 @@ private:
quintptr m_tag;
bool m_enabled;
bool m_visible;
- bool m_effectiveVisible;
QString m_text;
MenuType m_menuType;
MenuType m_effectiveMenuType;
@@ -140,11 +139,10 @@ private:
static QIOSMenu *m_currentMenu;
void updateVisibility();
- void updateVisibilityUsingUIMenuController();
- void updateVisibilityUsingUIPickerView();
+ void toggleShowUsingUIMenuController(bool show);
+ void toggleShowUsingUIPickerView(bool show);
QIOSMenuItemList visibleMenuItems() const;
void repositionMenu();
- void hide() { setVisible(false); }
#endif // QIOSMENU_H