ui: unify widget system

Author: s.kushnirenko

src/graphics/elements/lang_text.cpp

@@ -81,13 +81,7 @@ int lang_text_draw_year(int year, int x_offset, int y_offset, font_t font) {
     }
     return width;
 }
-void lang_text_draw_month_year_max_width(int month,
-                                         int year,
-                                         int x_offset,
-                                         int y_offset,
-                                         int box_width,
-                                         font_t font,
-                                         color color) {
+void lang_text_draw_month_year_max_width(int month, int year, int x_offset, int y_offset, int box_width, font_t font, color color) {
     int month_width = lang_text_get_width(25, month, font);
     int ad_bc_width = lang_text_get_width(20, year >= 0 ? 1 : 0, font);
     int space_width = font_definition_for(font)->space_width;

src/graphics/elements/lang_text.h

@@ -30,12 +30,4 @@ inline int lang_text_draw_amount(int group, int number, int amount, vec2i offset
 int lang_text_draw_year(int year, int x_offset, int y_offset, font_t font);
 void lang_text_draw_month_year_max_width(int month, int year, int x_offset, int y_offset, int box_width, font_t font, color color);
 
-int lang_text_draw_multiline(int group, int number, vec2i offset, int box_width, font_t font);
-
-namespace ui {
-    int label(int group, int number, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT, UiFlags_ flags = UiFlags_None, int box_width = 0);
-    int label(pcstr, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT, UiFlags_ flags = UiFlags_None, int box_width = 0);
-    int label_amount(int group, int number, int amount, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT, pcstr postfix = "");
-    int label_percent(int amount, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT);
-    void image(e_image_id img, vec2i pos);
-}
+int lang_text_draw_multiline(int group, int number, vec2i offset, int box_width, font_t font);

src/graphics/elements/panel.h

@@ -18,10 +18,4 @@ void unbordered_panel_draw(int x, int y, int width_blocks, int height_blocks);
 void label_draw(int x, int y, int width_blocks, int type);
 void label_draw_colored(painter &ctx, int x, int y, int width_blocks, int type, uint32_t mask);
 
-void large_label_draw(int x, int y, int width_blocks, int type);
-
-namespace ui {
-    void panel(vec2i pos, vec2i size, UiFlags_ flags);
-    void icon(vec2i pos, e_resource img);
-    void icon(vec2i pos, e_advisor advisor);
-}
+void large_label_draw(int x, int y, int width_blocks, int type);

src/graphics/elements/ui.cpp

@@ -125,7 +125,7 @@ int ui::label_percent(int amount, vec2i pos, font_t font) {
     return text_draw_percentage(amount, offset.x + pos.x, offset.y + pos.y, font);
 }
 
-void ui::image(e_image_id img, vec2i pos) {
+void ui::eimage(e_image_id img, vec2i pos) {
     painter ctx = game.painter();
     ImageDraw::img_generic(ctx, image_group(img), pos);
 }
@@ -149,12 +149,58 @@ void ui::icon(vec2i pos, e_advisor adv) {
     ImageDraw::img_generic(ctx, image_group(IMG_ADVISOR_ICONS) + (adv - 1), offset.x + pos.x, offset.y + pos.y);
 }
 
-
 arrow_button &ui::arw_button(vec2i pos, bool up, bool tiny) {
     const vec2i offset = g_state.offset();
 
     g_state.arw_buttons.push_back({pos.x, pos.y, up ? 17 : 15, 24, button_none, 0, 0});
     arrow_buttons_draw(offset, g_state.arw_buttons.back(), tiny);
 
     return g_state.arw_buttons.back();
-}
+}
+
+void ui::element::load(archive arch) {
+    pos = arch.r_vec2i("pos");
+    size = arch.r_size2i("size");
+}
+
+void ui::outer_panel::draw() {
+    ui::panel(pos, size, UiFlags_PanelOuter);
+}
+
+void ui::outer_panel::load(archive arch) {
+    pcstr type = arch.r_string("type");
+    assert(!strcmp(type, "outer_panel"));
+
+    element::load(arch);
+}
+
+void ui::widget::draw() {
+    for (auto &e : elements) {
+        e->draw();
+    }
+}
+
+void ui::widget::load(archive arch) {
+    elements.clear();
+    arch.r_objects("ui", [this] (pcstr key, archive elem) {
+        pcstr type = elem.r_string("type");
+        if (!strcmp(type, "outer_panel")) {
+            elements.push_back(std::make_shared<outer_panel>());
+            elements.back()->load(elem);
+        } else if (!strcmp(type, "image")) {
+            elements.push_back(std::make_shared<image>());
+            elements.back()->load(elem);
+        }
+    });
+}
+
+void ui::image::draw() {
+    ui::icon(pos, ADVISOR_RATINGS);
+}
+
+void ui::image::load(archive arch) {
+    pcstr type = arch.r_string("type");
+    assert(!strcmp(type, "image"));
+    img = arch.r_image("image");
+    element::load(arch);
+}

src/graphics/elements/ui.h

@@ -3,11 +3,16 @@
 #include <cstdint>
 
 #include "core/vec2i.h"
+#include "city/resource.h"
 
 #include "graphics/elements/generic_button.h"
 #include "graphics/elements/image_button.h"
+#include "graphics/elements/lang_text.h"
+#include "graphics/elements/panel.h"
 #include "graphics/image_groups.h"
 
+#include "js/js_game.h"
+
 struct mouse;
 
 enum UiFlags_ {
@@ -22,6 +27,45 @@ void begin_frame();
 void begin_widget(vec2i offset, bool relative = false);
 void end_widget();
 bool handle_mouse(const mouse *m);
+
+int label(int group, int number, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT, UiFlags_ flags = UiFlags_None, int box_width = 0);
+int label(pcstr, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT, UiFlags_ flags = UiFlags_None, int box_width = 0);
+int label_amount(int group, int number, int amount, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT, pcstr postfix = "");
+int label_percent(int amount, vec2i pos, font_t font = FONT_NORMAL_BLACK_ON_LIGHT);
+void eimage(e_image_id img, vec2i pos);
+void panel(vec2i pos, vec2i size, UiFlags_ flags);
+void icon(vec2i pos, e_resource img);
+void icon(vec2i pos, e_advisor advisor);
+
 pcstr str(int group, int id);
 
-}
+struct element {
+    vec2i pos;
+    vec2i size;
+
+    virtual void draw() {}
+    virtual void load(archive elem);
+
+    using ptr = std::shared_ptr<element>;
+};
+
+struct image : public element {
+    e_image_id img;
+
+    virtual void draw() override;
+    virtual void load(archive elem) override;
+};
+
+struct outer_panel : public element {
+    virtual void draw() override;
+    virtual void load(archive elem) override;
+};
+
+struct widget {
+    std::vector<element::ptr> elements;
+
+    virtual void draw();
+    virtual void load(archive arch);
+};
+
+} // ui

src/js/js_game.h

@@ -1,11 +1,13 @@
 #pragma once
 
 #include "mujs/mujs.h"
+
 #include "core/bstring.h"
 #include "js/js_defines.h"
 #include "core/vec2i.h"
 
 #include <vector>
+#include <string>
 
 enum e_image_id : uint16_t;
 
@@ -20,6 +22,23 @@ struct archive {
         return result;
     }
 
+    inline std::vector<std::string> r_array_str(pcstr name) {
+        js_getproperty(vm, -1, name);
+        std::vector<std::string> result;
+        if (js_isarray(vm, -1)) {
+            int length = js_getlength(vm, -1);
+
+            for (int i = 0; i < length; ++i) {
+                js_getindex(vm, -1, i);
+                std::string v = js_tostring(vm, -1);
+                result.push_back(v);
+                js_pop(vm, 1);
+            }
+            js_pop(vm, 1);
+        }
+        return result;
+    }
+
     template<typename T = int>
     inline std::vector<T> r_array_num(pcstr name) {
         js_getproperty(vm, -1, name);
@@ -83,6 +102,27 @@ struct archive {
         js_pop(vm, 1);
     }
 
+    template<typename T>
+    inline void r_objects(pcstr name, T read_func) {
+        this->r_section(name, [&read_func] (archive s_arch) {
+            pcstr key;
+            std::vector<bstring128> keys;
+            js_pushiterator(s_arch.vm, -1, 1);
+            while (key = js_nextiterator(s_arch.vm, -1)) {
+                keys.push_back(key);
+            }
+            js_pop(s_arch.vm, 1);
+
+            for (const auto &key : keys) {
+                js_getproperty(s_arch.vm, -1, key.c_str());
+                if (js_isobject(s_arch.vm, -1)) {
+                    read_func(key.c_str(), s_arch.vm);
+                }
+                js_pop(s_arch.vm, 1);
+            }
+        });
+    }
+
 protected:
     template<typename T>
     inline bool r_array_impl(T read_func) {

src/scripts/ui.js

@@ -27,10 +27,18 @@ main_menu_window = {
 }
 
 advisor_rating_window = {
-		outer_panel_pos : {x:0, y:0},
-		outer_panel_size : {w:40, h:27},
-		advisor_icon_image : IMG_ADVISOR_RATING_ICON,
-		advisor_icon_pos : {x: 10, y: 10},
+	  ui : {
+			outer_panel : {
+				type : "outer_panel",
+				pos  : {x:0, y:0},
+			  size : {w:40, h:27},
+			},
+			advisor_icon : {
+				type : "image",
+				image : IMG_ADVISOR_RATING_ICON,
+			  pos  : {x: 10, y: 10},
+			},
+		},
 		header_pos : {x:60, y:17},
 		header_population_pos : {x: 160, y:20},
 		background_img : IMG_ADVISOR_BACKGROUND,

src/window/advisor/advisor_ratings.cpp

@@ -2,10 +2,8 @@
 
 #include "city/ratings.h"
 #include "graphics/boilerplate.h"
-#include "graphics/elements/generic_button.h"
-#include "graphics/elements/lang_text.h"
 #include "graphics/view/view.h"
-#include "graphics/elements/panel.h"
+#include "graphics/elements/ui.h"
 #include "graphics/text.h"
 #include "graphics/window.h"
 #include "config/config.h"
@@ -19,9 +17,7 @@ ANK_REGISTER_CONFIG_ITERATOR(config_load_advisor_rating);
 
 static void button_rating(int rating, int param2);
 
-struct advisor_rating_window {
-    vec2i outer_panel_pos;
-    vec2i outer_panel_size;
+struct advisor_rating_window : public ui::widget {
     e_image_id advisor_icon_image;
     vec2i advisor_icon_pos;
     vec2i header_pos;
@@ -35,9 +31,9 @@ advisor_rating_window g_advisor_rating_window;
 
 void config_load_advisor_rating() {
     g_config_arch.r_section("advisor_rating_window", [] (archive arch) {
+        g_advisor_rating_window.load(arch);
+
         auto &w = g_advisor_rating_window;
-        w.outer_panel_pos = arch.r_vec2i("outer_panel_pos");
-        w.outer_panel_size = arch.r_size2i("outer_panel_size");
         w.advisor_icon_image = arch.r_image("advisor_icon_image");
         w.advisor_icon_pos = arch.r_vec2i("advisor_icon_pos");
         w.header_pos = arch.r_vec2i("header_pos");
@@ -92,13 +88,13 @@ static void draw_rating(int id, int value, int open_play, int goal) {
 }
 
 static int draw_background() {
-    return g_advisor_rating_window.outer_panel_size.y;
+    return 0;// g_advisor_rating_window.outer_panel_size.y;
 }
 
 static void draw_foreground() {
     auto &w = g_advisor_rating_window;
-    ui::panel(w.outer_panel_pos, w.outer_panel_size, UiFlags_PanelOuter);
-    ui::icon(w.advisor_icon_pos, ADVISOR_RATINGS);
+
+    g_advisor_rating_window.draw();
 
     ui::label(53, 0, w.header_pos, FONT_LARGE_BLACK_ON_LIGHT);
     bstring128 caption = (pcstr)ui::str(53, 7);
@@ -108,7 +104,7 @@ static void draw_foreground() {
     }
 
     ui::label(caption, w.header_population_pos, FONT_NORMAL_BLACK_ON_LIGHT);
-    ui::image(w.background_img, w.background_img_pos);
+    ui::eimage(w.background_img, w.background_img_pos);
 
     int open_play = scenario_is_open_play();