ui: simplify draw label_num/label_percent

Author: s.kushnirenko

src/building/building_tax_collector.cpp

@@ -4,6 +4,7 @@
 #include "city/object_info.h"
 #include "figure/figure.h"
 #include "game/resource.h"
+#include "city/finance.h"
 #include "graphics/elements/panel.h"
 #include "graphics/view/view.h"
 #include "graphics/elements/lang_text.h"
@@ -15,27 +16,27 @@
 #include "game/game.h"
 
 void building_tax_collector::window_info_background(object_info &c) {
-    ui::begin_window(c.offset);
+    ui::begin_widget(c.offset);
 
     c.help_id = e_text_building_tax_collector;
     c.go_to_advisor.left_a = ADVISOR_RATINGS;
     c.go_to_advisor.left_b = ADVISOR_FINANCIAL;
 
     window_building_play_sound(&c, snd::get_building_info_sound("tax_collector"));
 
-    {
+    { // header
         ui::panel(vec2i{0, 0}, {c.width_blocks, c.height_blocks}, UiFlags_PanelOuter);
-        ui::label(106, 0, vec2i{0, 10}, 16 * c.width_blocks, FONT_LARGE_BLACK_ON_LIGHT, UiFlags_LabelCentered);
+        ui::label(106, 0, vec2i{0, 10}, FONT_LARGE_BLACK_ON_LIGHT, UiFlags_LabelCentered, 16 * c.width_blocks);
         ui::icon(vec2i{16, 36}, RESOURCE_DEBEN);
     }
 
     building* b = building_get(c.building_id);
-    int width = lang_text_draw(106, 2, c.offset.x + 44, c.offset.y + 43, FONT_NORMAL_BLACK_ON_LIGHT);
-    if (config_get(CONFIG_GP_CH_NEW_TAX_COLLECTION_SYSTEM)) {
-        lang_text_draw_amount(8, 0, b->deben_storage, c.offset.x + 44 + width, c.offset.y + 43, FONT_NORMAL_BLACK_ON_LIGHT);
-    } else {
-        lang_text_draw_amount(8, 0, b->tax_income_or_storage, c.offset.x + 44 + width, c.offset.y + 43, FONT_NORMAL_BLACK_ON_LIGHT);
-    }
+    int width = ui::label(106, 2, {44, 43});
+    int amount = config_get(CONFIG_GP_CH_NEW_TAX_COLLECTION_SYSTEM) ? b->deben_storage : b->tax_income_or_storage;
+    ui::label_num(8, 0, amount, {44 + width, 43});
+
+    ui::label(60, 1, {c.width_blocks * 16 / 2 + 50, 40});
+    ui::label_percent(city_finance_tax_percentage(), {c.width_blocks * 16 / 2 + 150, 40});
 
     if (!c.has_road_access) {
         window_building_draw_description(c, 69, 25);
@@ -55,6 +56,8 @@ void building_tax_collector::window_info_background(object_info &c) {
 
     inner_panel_draw(c.offset.x + 16, c.offset.y + 136, c.width_blocks - 2, 4);
     window_building_draw_employment(&c, 142);
+
+    ui::end_widget();
 }
 
 void building_tax_collector::update_month() {

src/graphics/elements/arrow_button.h

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_ARROW_BUTTON_H
-#define GRAPHICS_ARROW_BUTTON_H
+#pragma once
 
 #include "input/mouse.h"
 
@@ -18,11 +17,4 @@ typedef struct {
 
 void arrow_buttons_draw(int x, int y, arrow_button* buttons, int num_buttons, bool tiny = false);
 
-int arrow_buttons_handle_mouse(const mouse* m,
-                               int x,
-                               int y,
-                               arrow_button* buttons,
-                               int num_buttons,
-                               int* focus_button_id);
-
-#endif // GRAPHICS_ARROW_BUTTON_H
+int arrow_buttons_handle_mouse(const mouse* m, int x, int y, arrow_button* buttons, int num_buttons, int* focus_button_id);

src/graphics/elements/lang_text.cpp

@@ -62,6 +62,7 @@ int lang_text_draw_amount(int group, int number, int amount, int x_offset, int y
     }
     return desc_offset_x + lang_text_draw(group, number + amount_offset, x_offset + desc_offset_x, y_offset, font);
 }
+
 int lang_text_draw_year(int year, int x_offset, int y_offset, font_t font) {
     int width = 0;
     if (year >= 0) {

src/graphics/elements/lang_text.h

@@ -32,5 +32,7 @@ void lang_text_draw_month_year_max_width(int month, int year, int x_offset, int
 int lang_text_draw_multiline(int group, int number, vec2i offset, int box_width, font_t font);
 
 namespace ui {
-    void label(int group, int number, vec2i pos, int box_width, font_t font, UiFlags_ flags); 
+    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_num(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);
 }

src/graphics/elements/ui.cpp

@@ -7,35 +7,45 @@
 #include "game/game.h"
 #include "graphics/boilerplate.h"
 
+#include <stack>
+
 namespace ui {
     struct state {
-        vec2i offset;
+        std::stack<vec2i> _offset;
         std::vector<generic_button> buttons;
         std::vector<image_button> img_buttons;
+
+        inline const vec2i offset() { return _offset.empty() ? vec2i{0, 0} : _offset.top(); }
     };
 
     state g_state;
     generic_button dummy;
 }
 
-void ui::begin_window(vec2i offset) {
-    g_state.offset = offset;
+void ui::begin_widget(vec2i offset) {
+    g_state._offset.push(offset);
     g_state.buttons.clear();
     g_state.img_buttons.clear();
 }
 
+void ui::end_widget() {
+    if (!g_state._offset.empty()) {
+        g_state._offset.pop();
+    }
+}
+
 bool ui::handle_mouse(const mouse *m) {
     bool handle = false;
     int tmp_btn = 0;
-    handle |= !!generic_buttons_handle_mouse(m, g_state.offset, g_state.buttons, tmp_btn);
-    handle |= image_buttons_handle_mouse(m, g_state.offset, g_state.img_buttons, tmp_btn);
+    handle |= !!generic_buttons_handle_mouse(m, g_state.offset(), g_state.buttons, tmp_btn);
+    handle |= image_buttons_handle_mouse(m, g_state.offset(), g_state.img_buttons, tmp_btn);
 
     return handle;
 }
 
 int ui::button_hover(const mouse *m) {
     for (auto &btn : g_state.buttons) {
-        if (is_button_hover(btn, g_state.offset)) {
+        if (is_button_hover(btn, g_state.offset())) {
             return (std::distance(&g_state.buttons.front(), &btn) + 1);
         }
     }
@@ -44,7 +54,7 @@ int ui::button_hover(const mouse *m) {
 }
 
 generic_button &ui::button(pcstr label, vec2i pos, vec2i size) {
-    const vec2i offset = g_state.offset;
+    const vec2i offset = g_state.offset();
 
     g_state.buttons.push_back({pos.x, pos.y, size.x + 4, size.y + 4, button_none, button_none, 0, 0});
     int focused = is_button_hover(g_state.buttons.back(), offset);
@@ -60,7 +70,7 @@ generic_button &ui::button(uint32_t id) {
 }
 
 image_button &ui::img_button(uint32_t group, uint32_t id, vec2i pos, vec2i size, int offset) {
-    const vec2i img_offset = g_state.offset;
+    const vec2i img_offset = g_state.offset();
     const mouse *m = mouse_get();
 
     g_state.img_buttons.push_back({pos.x, pos.y, size.x + 4, size.y + 4, IB_NORMAL, group, id, offset, button_none, button_none, 0, 0, true});
@@ -72,22 +82,35 @@ image_button &ui::img_button(uint32_t group, uint32_t id, vec2i pos, vec2i size,
     return g_state.img_buttons.back();
 }
 
-void ui::label(int group, int number, vec2i pos, int box_width, font_t font, UiFlags_ flags) {
-    const vec2i offset = g_state.offset;
+int ui::label(int group, int number, vec2i pos, font_t font, UiFlags_ flags, int box_width) {
+    const vec2i offset = g_state.offset();
     if (!!(flags & UiFlags_LabelCentered)) {
         lang_text_draw_centered(group, number, offset.x + pos.x, offset.y + pos.y, box_width, font);
+        return box_width;
+    } else {
+        return lang_text_draw(group, number, offset + pos, font);
     }
 }
 
+int ui::label_num(int group, int number, int amount, vec2i pos, font_t font, pcstr postfix) {
+    const vec2i offset = g_state.offset();
+    return lang_text_draw_amount(group, number, amount, offset.x + pos.x, offset.y + pos.y, font, postfix);
+}
+
+int ui::label_percent(int amount, vec2i pos, font_t font) {
+    const vec2i offset = g_state.offset();
+    return text_draw_percentage(amount, offset.x + pos.x, offset.y + pos.y, font);
+}
+
 void ui::panel(vec2i pos, vec2i size, UiFlags_ flags) {
-    const vec2i offset = g_state.offset;
+    const vec2i offset = g_state.offset();
     if (!!(flags & UiFlags_PanelOuter)) {
         outer_panel_draw(offset + pos, size.x, size.y);
     }
 }
 
 void ui::icon(vec2i pos, e_resource img) {
-    const vec2i offset = g_state.offset;
+    const vec2i offset = g_state.offset();
     painter ctx = game.painter();
     ImageDraw::img_generic(ctx, image_id_resource_icon(RESOURCE_DEBEN), offset.x + pos.x, offset.y + pos.y);
 }

src/graphics/elements/ui.h

@@ -11,13 +11,15 @@
 struct mouse;
 
 enum UiFlags_ {
+    UiFlags_None = 0,
     UiFlags_LabelCentered = 1 << 1,
     UiFlags_PanelOuter = 1 << 2,
 };
 
 namespace ui {
 
-void begin_window(vec2i offset);
+void begin_widget(vec2i offset);
+void end_widget();
 bool handle_mouse(const mouse *m);
 
 }

src/graphics/text.cpp

@@ -352,11 +352,13 @@ int text_draw_money(int value, int x_offset, int y_offset, font_t font) {
 
     return text_draw(str, x_offset, y_offset, font, 0);
 }
+
 int text_draw_percentage(int value, int x_offset, int y_offset, font_t font) {
     uint8_t str[NUMBER_BUFFER_LENGTH];
     number_to_string(str, value, '@', "%");
     return text_draw(str, x_offset, y_offset, font, 0);
 }
+
 int text_draw_label_and_number(const char* label,
                                int value,
                                const char* postfix,

src/window/advisor/financial.cpp src/window/advisor/advisor_financial.cpp

@@ -1,4 +1,4 @@
-#include "financial.h"
+#include "advisor_financial.h"
 
 #include "city/finance.h"
 #include "core/calc.h"
@@ -14,8 +14,9 @@
 
 static void button_change_taxes(int is_down, int param2);
 
-static arrow_button arrow_buttons_taxes[]
-  = {{180, 75, 17, 24, button_change_taxes, 1, 0}, {204, 75, 15, 24, button_change_taxes, 0, 0}};
+static arrow_button arrow_buttons_taxes[] = {
+    {180, 75, 17, 24, button_change_taxes, 1, 0}, {204, 75, 15, 24, button_change_taxes, 0, 0}
+};
 
 static int arrow_button_focus;
 
@@ -25,6 +26,7 @@ static void draw_row(int group, int number, int* y, int value_last_year, int val
     text_draw_number(value_this_year, '@', " ", 430, *y, FONT_NORMAL_BLACK_ON_LIGHT);
     *y += 15;
 }
+
 static int draw_background() {
     painter ctx = game.painter();
     outer_panel_draw(vec2i{0, 0}, 40, ADVISOR_HEIGHT);
@@ -55,8 +57,7 @@ static int draw_background() {
     // percentage taxpayers
     width = text_draw_percentage(city_finance_percentage_taxed_people(), 70, 103, FONT_NORMAL_WHITE_ON_DARK);
     width += lang_text_draw(60, 5, 70 + width, 103, FONT_NORMAL_WHITE_ON_DARK);
-    lang_text_draw_amount(
-      60, 22, city_finance_estimated_tax_uncollected(), 70 + width, 103, FONT_NORMAL_WHITE_ON_DARK, "Db");
+    lang_text_draw_amount(60, 22, city_finance_estimated_tax_uncollected(), 70 + width, 103, FONT_NORMAL_WHITE_ON_DARK, "Db");
 
     // table headers
     lang_text_draw(60, 6, 270, 133, FONT_NORMAL_BLACK_ON_LIGHT);

src/window/advisor/advisor_financial.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include "window/advisors.h"
+
+const advisor_window_type* window_advisor_financial(void);

src/window/advisor/financial.h

@@ -687,7 +687,7 @@ static void draw_background() {
 }
 
 static void draw_foreground() {
-    ui::begin_window(g_building_info_context.offset);
+    ui::begin_widget(g_building_info_context.offset);
     auto &context = g_building_info_context;
 
     // building-specific buttons
@@ -823,6 +823,7 @@ static void draw_foreground() {
                 window_invalidate();
              });
     }
+    ui::end_widget();
 }
 
 static int handle_specific_building_info_mouse(const mouse *m) {