src/gui/widgets/qmenu.cpp
changeset 23 89e065397ea6
parent 22 79de32ba3296
child 25 e24348a560a6
equal deleted inserted replaced
22:79de32ba3296 23:89e065397ea6
  2811         return;
  2811         return;
  2812     d->hasHadMouse = d->hasHadMouse || rect().contains(e->pos());
  2812     d->hasHadMouse = d->hasHadMouse || rect().contains(e->pos());
  2813 
  2813 
  2814     QAction *action = d->actionAt(e->pos());
  2814     QAction *action = d->actionAt(e->pos());
  2815     if (!action) {
  2815     if (!action) {
  2816         if (d->hasHadMouse)
  2816         if (d->hasHadMouse
       
  2817             && (!d->currentAction
       
  2818                 || !(d->currentAction->menu() && d->currentAction->menu()->isVisible())))
  2817             d->setCurrentAction(0);
  2819             d->setCurrentAction(0);
  2818         return;
  2820         return;
  2819     } else if(e->buttons()) {
  2821     } else if(e->buttons()) {
  2820         d->mouseDown = this;
  2822         d->mouseDown = this;
  2821     }
  2823     }