Browse Source

WIP Multiple selection

Josh Engebretson 10 years ago
parent
commit
eff439125c

+ 3 - 1
Source/ThirdParty/TurboBadger/tb_editfield.cpp

@@ -371,7 +371,9 @@ void TBEditField::OnFocusChanged(bool focused)
             if (!curText.Equals(m_initial_edit_text))
             {
                 TBWidgetEvent ev(EVENT_TYPE_CUSTOM);
-                ev.ref_id = TBIDC("edit_complete");
+                // TBIDC does not register the TBID with the UI system, so do it this way
+                TBID refid("edit_complete");
+                ev.ref_id = refid;
                 // forward to delegate
                 TBWidget::OnEvent(ev);
             }

+ 3 - 1
Source/ThirdParty/TurboBadger/tb_inline_select.cpp

@@ -153,7 +153,9 @@ bool TBInlineSelect::OnEvent(const TBWidgetEvent &ev)
 void TBInlineSelect::InvokeModifiedEvent()
 {
     TBWidgetEvent ev(EVENT_TYPE_CUSTOM);
-    ev.ref_id = TBIDC("edit_complete");
+    // TBIDC does not register the TBID with the UI system, so do it this way
+    TBID refid("edit_complete");
+    ev.ref_id = refid;
     // forward to delegate
     TBWidget::OnEvent(ev);
     m_modified = false;

+ 4 - 1
Source/ThirdParty/TurboBadger/tb_select.cpp

@@ -249,7 +249,9 @@ void TBSelectList::SelectItem(int index, bool selected)
         if (changed)
         {
             TBWidgetEvent ev(EVENT_TYPE_CUSTOM);
-            ev.ref_id = TBIDC("select_list_selection_changed");
+            // TBIDC does not register the string with the UI system
+            TBID refid("select_list_selection_changed");
+            ev.ref_id = refid;
             // forward to delegate
             TBWidget::OnEvent(ev);
         }
@@ -315,6 +317,7 @@ bool TBSelectList::OnEvent(const TBWidgetEvent &ev)
             else
             {
                SetValue(index);
+               SelectItem(index, true);
             }
         }
         else