Fixed spinner widgets in modal dialogs

This commit is contained in:
Deve 2018-11-18 00:29:49 +01:00
parent 0c57d55a9d
commit 9ca7e2b424

View File

@ -751,7 +751,6 @@ EventPropagation EventHandler::onWidgetActivated(GUIEngine::Widget* w, const int
{
return EVENT_BLOCK;
}
if (w->m_event_handler == NULL) return EVENT_LET;
}
//Log::info("EventHandler", "Widget activated: %s", w->m_properties[PROP_ID].c_str());
@ -762,6 +761,12 @@ EventPropagation EventHandler::onWidgetActivated(GUIEngine::Widget* w, const int
SpinnerWidget* spinner = dynamic_cast<SpinnerWidget*>(w);
spinner->activateSelectedButton();
}
//FIXME: that early return may be not needed
if (ModalDialog::isADialogActive() && (parent == NULL || parent->m_type != GUIEngine::WTYPE_RIBBON))
{
if (w->m_event_handler == NULL) return EVENT_LET;
}
if (w->m_event_handler != NULL)
{