improve combobox and menu design

src/framework/ui/uicheckbox.cpp

@@ -77,14 +77,3 @@ void UICheckBox::onStyleApply(const std::string& styleName, const OTMLNodePtr& s
         }
     }
 }
-
-bool UICheckBox::isChecked()
-{
-    return hasState(Fw::CheckedState);
-}
-
-void UICheckBox::setChecked(bool checked)
-{
-    if(setState(Fw::CheckedState, checked))
-        callLuaField("onCheckChange", checked);
-}

src/framework/ui/uicheckbox.h

@@ -31,9 +31,6 @@ public:
     UICheckBox();
     void render();
 
-    bool isChecked();
-    void setChecked(bool checked);
-
     void setText(const std::string& text) { m_text = text; }
     std::string getText() { return m_text; }
 

src/framework/ui/uiwidget.cpp

@@ -69,6 +69,8 @@ void UIWidget::destroy()
         if(parent->hasChild(asUIWidget()))
             parent->removeChild(asUIWidget());
     }
+
+    callLuaField("onDestroy");
 }
 
 void UIWidget::render()
@@ -200,6 +202,17 @@ void UIWidget::setPressed(bool pressed)
     }
 }
 
+void UIWidget::setOn(bool on)
+{
+    setState(Fw::OnState, on);
+}
+
+void UIWidget::setChecked(bool checked)
+{
+    if(setState(Fw::CheckedState, checked))
+        callLuaField("onCheckChange", checked);
+}
+
 void UIWidget::setFocusable(bool focusable)
 {
     if(m_focusable != focusable) {
@@ -278,8 +291,8 @@ void UIWidget::setRect(const Rect& rect)
             self->m_updateEventScheduled = false;
             self->onGeometryChange(oldRect, self->getRect());
         });
+        m_updateEventScheduled = true;
     }
-    m_updateEventScheduled = true;
 }
 
 void UIWidget::setIcon(const std::string& iconFile)
@@ -769,8 +782,10 @@ void UIWidget::updateLayout()
 void UIWidget::applyStyle(const OTMLNodePtr& styleNode)
 {
     try {
+        m_loadingStyle = true;
         onStyleApply(styleNode->tag(), styleNode);
         callLuaField("onStyleApply", styleNode->tag(), styleNode);
+        m_loadingStyle = false;
     } catch(Exception& e) {
         logError("Failed to apply style to widget '", m_id, "' style: ", e.what());
     }
@@ -896,7 +911,7 @@ void UIWidget::updateState(Fw::WidgetState state)
 
 void UIWidget::updateStates()
 {
-    for(int state = 1; state != Fw::LastState; state <<= 1)
+    for(int state = 1; state != Fw::LastWidgetState; state <<= 1)
         updateState((Fw::WidgetState)state);
 }
 
@@ -912,6 +927,16 @@ void UIWidget::updateChildrenIndexStates()
 
 void UIWidget::updateStyle()
 {
+    if(m_loadingStyle && !m_updateStyleScheduled) {
+        UIWidgetPtr self = asUIWidget();
+        g_dispatcher.addEvent([self] {
+            self->m_updateStyleScheduled = false;
+            self->updateStyle();
+        });
+        m_updateStyleScheduled = true;
+        return;
+    }
+
     if(!m_style)
         return;
 
@@ -995,6 +1020,10 @@ void UIWidget::onStyleApply(const std::string& styleName, const OTMLNodePtr& sty
             setEnabled(node->value<bool>());
         else if(node->tag() == "visible")
             setVisible(node->value<bool>());
+        else if(node->tag() == "checked")
+            setChecked(node->value<bool>());
+        else if(node->tag() == "on")
+            setOn(node->value<bool>());
         else if(node->tag() == "focusable")
             setFocusable(node->value<bool>());
         else if(node->tag() == "phantom")

src/framework/ui/uiwidget.h

@@ -57,6 +57,8 @@ public:
     void setVisible(bool visible);
     void setEnabled(bool enabled);
     void setPressed(bool pressed);
+    void setOn(bool on);
+    void setChecked(bool checked);
     void setId(const std::string& id) { m_id = id; }
     void setFocusable(bool focusable);
     void setPhantom(bool phantom) { m_phantom = phantom; }
@@ -112,6 +114,8 @@ public:
     bool isMiddle() { return hasState(Fw::MiddleState); }
     bool isLast() { return hasState(Fw::LastState); }
     bool isAlternate() { return hasState(Fw::AlternateState); }
+    bool isChecked() { return hasState(Fw::CheckedState); }
+    bool isOn() { return hasState(Fw::OnState); }
     bool isVisible();
     bool isHidden() { return !isVisible(); }
     bool isExplicitlyEnabled() { return m_enabled; }
@@ -226,6 +230,8 @@ protected:
     Boolean<false> m_pressed;
     Boolean<false> m_phantom;
     Boolean<false> m_updateEventScheduled;
+    Boolean<false> m_loadingStyle;
+    Boolean<false> m_updateStyleScheduled;
     Boolean<true> m_firstOnStyle;
     Rect m_rect;
     UILayoutPtr m_layout;