From 6ace984440b6d02eb04958526713036db6b402ea Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Thu, 29 Mar 2012 17:21:59 -0300 Subject: [PATCH] fix combobox --- modules/core_lib/widgets/uicombobox.lua | 3 ++- src/framework/ui/uimanager.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/core_lib/widgets/uicombobox.lua b/modules/core_lib/widgets/uicombobox.lua index ef6b9aed..8329df3c 100644 --- a/modules/core_lib/widgets/uicombobox.lua +++ b/modules/core_lib/widgets/uicombobox.lua @@ -36,7 +36,8 @@ function UIComboBox:addOption(text, data) end function UIComboBox:onMousePress(mousePos, mouseButton) - local menu = createWidget(self:getStyleName() .. 'PopupMenu', self) + local menu = createWidget(self:getStyleName() .. 'PopupMenu') + menu:setId(self:getId() .. 'PopupMenu') for i,v in ipairs(self.options) do menu:addOption(v.text, function() self:setCurrentOption(v.text) end) end diff --git a/src/framework/ui/uimanager.cpp b/src/framework/ui/uimanager.cpp index 412825af..8844eb1b 100644 --- a/src/framework/ui/uimanager.cpp +++ b/src/framework/ui/uimanager.cpp @@ -92,7 +92,8 @@ void UIManager::inputEvent(const InputEvent& event) if(UIWidgetPtr parent = widget->getParent()) parent->focusChild(widget, Fw::MouseFocusReason); } - widget->onMousePress(event.mousePos, event.mouseButton); + if(widget->onMousePress(event.mousePos, event.mouseButton)) + break; } break;