1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QMenu: Fix a typo EventShouldBePropogated -> EventShouldBePropagated

Browse Source 
Change-Id: Id9439bd749576d1f7dfcb1653905f5de47b825b4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
This commit is contained in:
Alexander Volkov 2015-10-23 15:12:33 +03:00
parent 0f54343808
commit 8a8a5813a9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/widgets/qmenu.cpp
View File

@ -3143,7 +3143,7 @@ void QMenu::mouseMoveEvent(QMouseEvent *e)
d->activeMenu->d_func()->setCurrentAction(0); d->activeMenu->d_func()->setCurrentAction(0);
QMenuSloppyState::MouseEventResult sloppyEventResult = d->sloppyState.processMouseEvent(e->localPos(), action, d->currentAction); QMenuSloppyState::MouseEventResult sloppyEventResult = d->sloppyState.processMouseEvent(e->localPos(), action, d->currentAction);
if (sloppyEventResult == QMenuSloppyState::EventShouldBePropogated) { if (sloppyEventResult == QMenuSloppyState::EventShouldBePropagated) {
d->setCurrentAction(action, d->mousePopupDelay); d->setCurrentAction(action, d->mousePopupDelay);
} else if (sloppyEventResult == QMenuSloppyState::EventDiscardsSloppyState) { } else if (sloppyEventResult == QMenuSloppyState::EventDiscardsSloppyState) {
d->sloppyState.reset(); d->sloppyState.reset();

10
src/widgets/widgets/qmenu_p.h
View File

@ -126,7 +126,7 @@ public:
enum MouseEventResult { enum MouseEventResult {
EventIsProcessed, EventIsProcessed,
EventShouldBePropogated, EventShouldBePropagated,
EventDiscardsSloppyState EventDiscardsSloppyState
}; };
@ -187,14 +187,14 @@ public:
m_parent->stopTimer(); m_parent->stopTimer();
if (!m_enabled) if (!m_enabled)
return EventShouldBePropogated; return EventShouldBePropagated;
if (!m_time.isActive()) if (!m_time.isActive())
startTimer(); startTimer();
if (!m_sub_menu) { if (!m_sub_menu) {
reset(); reset();
return EventShouldBePropogated; return EventShouldBePropagated;
} }
QSetValueOnDestroy<bool> setFirstMouse(m_first_mouse, false); QSetValueOnDestroy<bool> setFirstMouse(m_first_mouse, false);
@ -208,7 +208,7 @@ public:
if (m_action_rect.contains(mousePos)) { if (m_action_rect.contains(mousePos)) {
startTimer(); startTimer();
return currentAction == m_menu->menuAction() ? EventIsProcessed : EventShouldBePropogated; return currentAction == m_menu->menuAction() ? EventIsProcessed : EventShouldBePropagated;
} }
if (m_uni_directional && !m_first_mouse && resetAction != m_origin_action) { if (m_uni_directional && !m_first_mouse && resetAction != m_origin_action) {
@ -247,7 +247,7 @@ public:
} }
return m_select_other_actions ? EventShouldBePropogated : EventIsProcessed; return m_select_other_actions ? EventShouldBePropagated : EventIsProcessed;
} }
void setSubMenuPopup(const QRect &actionRect, QAction *resetAction, QMenu *subMenu); void setSubMenuPopup(const QRect &actionRect, QAction *resetAction, QMenu *subMenu);