refactor(ui): merge widget_parent into widget

Author: std-microblock

src/shell/contextmenu/menu_widget.h

@@ -43,8 +43,8 @@ enum class popup_direction {
   bottom_right,
 };
 
-struct menu_widget : public ui::widget_parent_flex {
-  using super = ui::widget_parent_flex;
+struct menu_widget : public ui::widget_flex {
+  using super = ui::widget_flex;
   float bg_padding_vertical = 6;
   std::shared_ptr<ui::rect_widget> bg;
   menu menu_data;

src/ui/ui.cc

@@ -25,7 +25,7 @@ void render_target::start_loop() {
   }
 }
 std::expected<bool, std::string> render_target::init() {
-  root = std::make_shared<widget_parent>();
+  root = std::make_shared<widget>();
 
   std::ignore = init_global();
 

src/ui/ui.h

@@ -14,7 +14,7 @@
 
 namespace ui {
 struct render_target {
-  std::shared_ptr<widget_parent> root;
+  std::shared_ptr<widget> root;
   GLFWwindow *window;
 
   NVGcontext *nvg;

src/ui/widget.cc

@@ -2,8 +2,7 @@
 #include "ui.h"
 #include <chrono>
 #include <thread>
-void ui::widget_parent::render(nanovg_context ctx) {
-  widget::render(ctx);
+void ui::widget::render(nanovg_context ctx) {
   float orig_offset_x = ctx.offset_x, orig_offset_y = ctx.offset_y;
   for (auto &child : children) {
     ctx.offset_x = *x + orig_offset_x;
@@ -16,8 +15,11 @@ void ui::widget_parent::render(nanovg_context ctx) {
   ctx.offset_x = orig_offset_x;
   ctx.offset_y = orig_offset_y;
 }
-void ui::widget_parent::update(update_context &ctx) {
-  widget::update(ctx);
+void ui::widget::update(update_context &ctx) {
+  for (auto anim : anim_floats) {
+    anim->update(ctx.delta_t);
+  }
+
   float orig_offset_x = ctx.offset_x, orig_offset_y = ctx.offset_y;
 
   for (auto &child : children) {
@@ -29,15 +31,10 @@ void ui::widget_parent::update(update_context &ctx) {
   ctx.offset_x = orig_offset_x;
   ctx.offset_y = orig_offset_y;
 }
-void ui::widget_parent::add_child(std::shared_ptr<widget> child) {
+void ui::widget::add_child(std::shared_ptr<widget> child) {
   children.push_back(std::move(child));
 }
 
-void ui::widget::update(update_context &ctx) {
-  for (auto anim : anim_floats) {
-    anim->update(ctx.delta_t);
-  }
-}
 bool ui::update_context::hovered(widget *w, bool hittest) const {
   if (hittest && !hovered_widgets.empty())
     return false;
@@ -46,8 +43,8 @@ bool ui::update_context::hovered(widget *w, bool hittest) const {
 }
 float ui::widget::measure_height(update_context &ctx) { return height->dest(); }
 float ui::widget::measure_width(update_context &ctx) { return width->dest(); }
-void ui::widget_parent_flex::update(update_context &ctx) {
-  widget_parent::update(ctx);
+void ui::widget_flex::update(update_context &ctx) {
+  widget::update(ctx);
   float x = 0, y = 0;
   float target_width = 0, target_height = 0;
 
@@ -124,4 +121,3 @@ bool ui::widget::check_hit(const update_context &ctx) {
          ctx.mouse_y >= (y->dest() + ctx.offset_y) &&
          ctx.mouse_y <= (y->dest() + height->dest() + ctx.offset_y);
 }
-void ui::widget::render(nanovg_context ctx) {}

src/ui/widget.h

@@ -54,6 +54,11 @@ struct update_context {
 All the widgets in the tree should be wrapped in a shared_ptr.
 If you want to use a widget in multiple places, you should create a new instance
 for each place.
+
+It is responsible for updating and rendering its children
+It also sets the offset for the children
+It's like `posision: relative` in CSS
+While all other widgets are like `position: absolute`
 */
 struct widget : std::enable_shared_from_this<widget> {
   std::vector<sp_anim_float> anim_floats{};
@@ -77,18 +82,9 @@ struct widget : std::enable_shared_from_this<widget> {
   }
 
   virtual bool check_hit(const update_context &ctx);
-};
 
-// A widget that renders its children
-// It is responsible for updating and rendering its children
-// It also sets the offset for the children
-// It's like `posision: relative` in CSS
-// While all other widgets are like `position: absolute`
-struct widget_parent : public widget {
-  std::vector<std::shared_ptr<widget>> children;
-  void render(nanovg_context ctx) override;
-  void update(update_context &ctx) override;
   void add_child(std::shared_ptr<widget> child);
+  std::vector<std::shared_ptr<widget>> children;
   template <typename T, typename... Args>
   inline void emplace_child(Args &&...args) {
     children.emplace_back(std::make_shared<T>(std::forward<Args>(args)...));
@@ -115,7 +111,7 @@ struct widget_parent : public widget {
 };
 
 // A widget with child which lays out children in a row or column
-struct widget_parent_flex : public widget_parent {
+struct widget_flex : public widget {
   float gap = 0;
   bool horizontal = false;
   bool auto_size = true;

src/ui_test/test.cc

@@ -145,8 +145,8 @@ struct menu_item_widget : public ui::widget {
   }
 };
 
-struct menu_widget : public ui::widget_parent_flex {
-  using super = ui::widget_parent_flex;
+struct menu_widget : public ui::widget_flex {
+  using super = ui::widget_flex;
   float bg_padding_vertical = 6;
   float anchor_x = 0, anchor_y = 0;
   std::unique_ptr<ui::acrylic_background_widget> bg;