FCL/sf/mw/hb: comparison src/hbcore/gui/hbmenu.cpp

equal deleted inserted replaced

-:e6ad4ef83b23
+:b7da29130b0e
 #include "hbeffect.h"
 #include "hbeffectinternal_p.h"
 bool HbMenuPrivate::menuEffectsLoaded = false;
 #endif
 #include "hbglobal_p.h"
+#include <QGraphicsSceneMouseEvent>
 #include <QPointer>
 Q_DECLARE_METATYPE (QAction*)// krazy:exclude=qclasses
 HbMenuPrivate::HbMenuPrivate():
 mSubMenuItem(0),
 mRightMargin(0.0),
 mDownMargin(0.0),
 delayMenuConstruction(true),
 receiverToDisconnectOnClose(0),
-mNumberOfColumns(1)
+mNumberOfColumns(1),
+mCloseAllMenus(false)
 {
 }
 HbMenuPrivate::~HbMenuPrivate()
 {
 Q_Q(HbMenu);
 // do not close the menu tree if the triggered action is
 // submenu item
 if (!action->menu()) {
+mCloseAllMenus = true;
 q->close();
 } else {
 stopTimeout();
 }
 }
 // huh ? activeSubMenu = 0;
 }
 }
 }
+/*
+reimp
+*/
+void HbMenuPrivate::handleBackgroundMouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+Q_Q(HbMenu);
+// Handle cases only for Background or Popup originated mouse presses and when
+// any dismiss policy defined
+if (mousePressLocation != None && dismissPolicy != HbPopup::NoDismiss) {
+MouseEventLocationType mouseReleaseLocation = Background;
+HbMenu* tempMenu = 0;
+QList<QGraphicsItem*> itemList = q->scene()->items(event->pos());
+foreach (QGraphicsItem* sceneItem, itemList ){
+QGraphicsWidget *focusWidget = 0;
+HbMenu *focusMenu = 0;
+if (sceneItem && sceneItem->isWidget()) {
+focusWidget = static_cast<QGraphicsWidget*>(sceneItem);
+focusMenu = qobject_cast<HbMenu *>(focusWidget);
+}
+if( focusMenu ) {
+mouseReleaseLocation = Popup;
+tempMenu = focusMenu;
+break;
+}
+}
+// Mouse is released within menu
+if (mouseReleaseLocation == Popup) {
+HbAction* menuAction = tempMenu->activeAction();
+if(menuAction){
+mCloseAllMenus = false;
+closeMenuRecursively(menuAction);
+}
+mousePressLocation = None;
+}
+else {
+// trigger the menu to close whole menu
+mCloseAllMenus = true;
+q->close();
+mousePressLocation = None;
+}
+}
+}
 void HbMenuPrivate::_q_subMenuTimedOut()
 {
 Q_Q(HbMenu);
 if( menuTimedOut (activeSubMenu) ) {
 if ( activeSubMenu ) {
 }
 timedOut = true;
 q->close();
 } else {
 startTimeout();
-}
+mCloseAllMenus = false;
+}
+if (activeSubMenu && HbMenuPrivate::d_ptr(activeSubMenu)->mCloseAllMenus) {
+mCloseAllMenus = true;
+q->close();
+}
 }
 void HbMenuPrivate::_q_handleMenuClose()
 {
 Q_Q(HbMenu);

changeset 28	b7da29130b0e
parent 23	e6ad4ef83b23
child 30	80e4d18b72f5