TreeView: Fix rendering and add callback

Author: kimkulling

contrib/vcpkg

@@ -105,9 +105,10 @@ int main(int argc, char *argv[]) {
 
     Widgets::inputText(9, RootPanelId, Rect(100, 350, 100, 40), Alignment::Left);
 
-    Widgets::treeView(10, RootPanelId, "tree", Rect(100, 400, 100, 40), nullptr);
+    Widgets::treeView(10, RootPanelId, "tree", Rect(100, 400, 100, 40));
     Widgets::treeItem(11, 10, "Item 1");
     Widgets::treeItem(12, 10, "Item 2");
+    Widgets::setEnableState(12, false);
 
     while (TinyUi::run()) {
         TinyUi::render();

samples/main.cpp

@@ -346,7 +346,12 @@ ret_code Widgets::panel(Id id, Id parentId, const char *title, const Rect &rect,
     return ResultOk;
 }
 
-ret_code Widgets::treeView(Id id, Id parentId, const char *title, const Rect &rect, CallbackI *callback) {
+static int onTreeViewItemClicked(uint32_t id, void *data) {
+    std::cout << "TreeView item clicked: " << id << std::endl;
+    return 0;
+}
+
+ret_code Widgets::treeView(Id id, Id parentId, const char *title, const Rect &rect) {
     auto &ctx = TinyUi::getContext();
     if (ctx.mSDLContext.mRenderer == nullptr) {
         return InvalidRenderHandle;
@@ -361,9 +366,13 @@ ret_code Widgets::treeView(Id id, Id parentId, const char *title, const Rect &re
         return ErrorCode;
     }
 
+    
     if (title != nullptr) {
         widget->mText.assign(title);
-    }   
+    }
+
+    CallbackI *callback = new CallbackI(onTreeViewItemClicked, nullptr, Events::MouseButtonDownEvent);
+    widget->mCallback = callback;
 
     return ResultOk;
 }
@@ -386,12 +395,7 @@ ret_code Widgets::treeItem(Id id, Id parentItemId, const char *text) {
     auto &parentRect = parentWidget->mRect;
 
     const int32_t margin = ctx.mStyle.mMargin;
-    int32_t w = parentRect.width;
-    if (text != nullptr) {
-        const size_t numGlyphs = strlen(text);
-        w = static_cast<int32_t>(numGlyphs) * static_cast<int32_t>(ctx.mSDLContext.mDefaultFont->mSize);
-    }
-
+    const int32_t w = parentRect.width;
     const int32_t h = parentRect.height;
     size_t numChildren = parentWidget->mChildren.size() + 1;
     const Rect rect(parentRect.top.x + margin, parentRect.top.y + numChildren * margin + numChildren * h, w, h);

src/widgets.cpp

@@ -27,7 +27,7 @@ SOFTWARE.
 
 namespace tinyui {
 
-// Forward declarations
+// Forward declarations -------------------------------------------------------
 struct Context;
 
 /// @brief  This enum is used to descripe the widget type-
@@ -230,7 +230,7 @@ struct Widgets {
     /// @param rect     The rect of the widget.
     /// @param callback The callback of the widget.
     /// @return ResultOk if the widget was created, ErrorCode if not.
-    static ret_code treeView(Id id, Id parentId, const char *title, const Rect &rect, CallbackI *callback);
+    static ret_code treeView(Id id, Id parentId, const char *title, const Rect &rect);
 
     /// @brief Creates a new tree item.
     /// @param id           The unique id of the tree item.