ui: add simplify using image_button logic

Author: s.kushnirenko

src/graphics/elements/button.cpp

@@ -3,6 +3,8 @@
 #include "graphics/boilerplate.h"
 #include "graphics/view/view.h"
 #include "game/game.h"
+#include "generic_button.h"
+#include "image_button.h"
 
 void button_none(int param1, int param2) {
 }
@@ -51,3 +53,63 @@ void button_border_draw(int x, int y, int width_pixels, int height_pixels, bool
         }
     }
 }
+
+namespace ui {
+    struct state {
+        vec2i offset;
+        std::vector<generic_button> buttons;
+        std::vector<image_button> img_buttons;
+    };
+
+    state g_state;
+    generic_button dummy;
+}
+
+void ui::begin_window(vec2i offset) {
+    g_state.offset = offset;
+    g_state.buttons.clear();
+}
+
+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);
+
+    return handle;
+}
+
+int ui::button_hover(const mouse *m) {
+    for (auto &btn : g_state.buttons) {
+        if (is_button_hover(btn, g_state.offset)) {
+            return (std::distance(&g_state.buttons.front(), &btn) + 1);
+        }
+    }
+
+    return 0;
+}
+
+generic_button &ui::button(pcstr label, vec2i pos, vec2i size) {
+    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);
+
+    button_border_draw(offset.x + pos.x, offset.y + pos.y, size.x, size.y, focused ? 1 : 0);
+    text_draw_centered((uint8_t *)label, offset.x + pos.x + 1, offset.y + pos.y + 4, 20, FONT_NORMAL_BLACK_ON_LIGHT, 0);
+
+    return g_state.buttons.back();
+}
+
+generic_button &ui::button(uint32_t id) {
+    return (id < g_state.buttons.size()) ? g_state.buttons[id] : dummy;
+}
+
+image_button &ui::img_button(uint32_t group, uint32_t id, vec2i pos, vec2i size, int offset) {
+    const vec2i img_offset = g_state.offset;
+
+    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});
+    image_buttons_draw(img_offset + pos, g_state.img_buttons.back());
+
+    return g_state.img_buttons.back();
+}

src/graphics/elements/button.h

@@ -1,8 +1,23 @@
-#ifndef GRAPHICS_BUTTON_H
-#define GRAPHICS_BUTTON_H
+#pragma once
+
+#include "core/string.h"
+#include "core/vec2i.h"
 
 void button_none(int param1, int param2);
 
 void button_border_draw(int x, int y, int width_pixels, int height_pixels, bool has_focus);
 
-#endif // GRAPHICS_BUTTON_H
+struct generic_button;
+struct image_button;
+struct mouse;
+
+namespace ui {
+
+void begin_window(vec2i offset);
+bool handle_mouse(const mouse *m);
+int button_hover(const mouse *m);
+generic_button &button(pcstr label, vec2i pos, vec2i size);
+generic_button &button(uint32_t id);
+image_button &img_button(uint32_t group, uint32_t id, vec2i pos, vec2i size, int offset = 0);
+
+}

src/graphics/elements/generic_button.cpp

@@ -2,53 +2,6 @@
 
 #include "input/mouse.h"
 
-namespace ui {
-    struct state {
-        vec2i offset;
-        std::vector<generic_button> buttons;
-    };
-
-    state g_state;
-    generic_button dummy;
-}
-
-void ui::begin_window(vec2i offset) {
-    g_state.offset = offset;
-    g_state.buttons.clear();
-}
-
-int ui::handle_mouse(const mouse *m) {
-    int tmp_btn;
-    return generic_buttons_handle_mouse(m, g_state.offset, g_state.buttons, tmp_btn);
-}
-
-int ui::button_hover(const mouse *m) {
-    for (auto &btn : g_state.buttons) {
-        if (is_button_hover(btn, g_state.offset)) {
-            return (std::distance(&g_state.buttons.front(), &btn) + 1);
-        }
-    }
-
-    return 0;
-}
-
-generic_button &ui::button(pcstr label, vec2i pos, vec2i size) {
-    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);
-
-    button_border_draw(offset.x + pos.x, offset.y + pos.y, size.x, size.y, focused ? 1 : 0);
-    text_draw_centered((uint8_t *)label, offset.x + pos.x + 1, offset.y + pos.y + 4, 20, FONT_NORMAL_BLACK_ON_LIGHT, 0);
-
-    return g_state.buttons.back();
-}
-
-
-generic_button &ui::button(uint32_t id) {
-    return (id < g_state.buttons.size()) ? g_state.buttons[id] : dummy;
-}
-
 static int get_button(const mouse* m, int x, int y, const generic_button* buttons, int num_buttons) {
     for (int i = 0; i < num_buttons; i++) {
         if (x + buttons[i].x <= m->x && x + buttons[i].x + buttons[i].width > m->x && y + buttons[i].y <= m->y

src/graphics/elements/generic_button.h

@@ -32,21 +32,14 @@ int generic_buttons_min_handle_mouse(const mouse* m, int x, int y, const generic
 
 bool is_button_hover(generic_button &button, vec2i context);
 
-template<class T, uint32_t N>
-inline int generic_buttons_handle_mouse(const mouse *m, vec2i pos, const T (&buttons)[N], int &focus_button_id) {
+template<uint32_t N>
+inline int generic_buttons_handle_mouse(const mouse *m, vec2i pos, const generic_button (&buttons)[N], int &focus_button_id) {
     return generic_buttons_handle_mouse(m, pos.x, pos.y, buttons, N, &focus_button_id);
 }
 
 template<class T>
 inline int generic_buttons_handle_mouse(const mouse *m, vec2i pos, const T &buttons, int &focus_button_id) {
-    return generic_buttons_handle_mouse(m, pos.x, pos.y, &buttons.front(), (int)buttons.size(), &focus_button_id);
-}
-
-namespace ui {
-void begin_window(vec2i offset);
-int handle_mouse(const mouse *m);
-int button_hover(const mouse *m);
-generic_button &button(pcstr label, vec2i pos, vec2i size);
-generic_button &button(uint32_t id);
-
+    return buttons.size() > 0
+                ? generic_buttons_handle_mouse(m, pos.x, pos.y, &buttons.front(), (int)buttons.size(), &focus_button_id)
+                : 0; 
 }

src/graphics/elements/image_button.h

@@ -6,6 +6,7 @@
 #include "core/time.h"
 
 #include <vector>
+#include <functional>
 
 enum { 
     IB_BUILD = 2,
@@ -15,14 +16,14 @@ enum {
 };
 
 struct image_button {
-    short x_offset;
-    short y_offset;
-    short width;
-    short height;
+    int x_offset;
+    int y_offset;
+    int width;
+    int height;
     short button_type;
-    unsigned int image_collection;
-    unsigned int image_group;
-    short image_offset;
+    uint32_t image_collection;
+    uint32_t image_group;
+    int image_offset;
     void (*left_click_handler)(int param1, int param2);
     void (*right_click_handler)(int param1, int param2);
     int parameter1;
@@ -33,11 +34,22 @@ struct image_button {
     char floating;
     char focused;
     time_millis pressed_since;
+
+    std::function<void(int,int)> _onclick;
+
+    template<class Func> image_button &onclick(Func f) { _onclick = f; return *this; }
 };
 
+template<size_t N>
+bool image_buttons_handle_mouse(const mouse *m, vec2i pos, image_button (&buttons)[N], int &focus_button_id) {
+    return image_buttons_handle_mouse(m, pos.x, pos.y, std::begin(buttons), (int)N, &focus_button_id);
+}
+
 template<class T>
 bool image_buttons_handle_mouse(const mouse *m, vec2i pos, T &buttons, int &focus_button_id) {
-    return image_buttons_handle_mouse(m, pos.x, pos.y, std::begin(buttons), (int)std::size(buttons), &focus_button_id);
+    return buttons.size() > 0 
+                ? image_buttons_handle_mouse(m, pos.x, pos.y, &buttons.front(), (int)buttons.size(), &focus_button_id)
+                : 0;
 }
 
 template<class T>

src/window/window_building_info.cpp

@@ -78,7 +78,6 @@ struct building_info_data {
     int image_button_id = 0;
 
     struct {
-        image_button advisor = {350, -38, 28, 28, IB_NORMAL, GROUP_MESSAGE_ADVISOR_BUTTONS, 9, button_advisor, button_none, ADVISOR_RATINGS, 0, 1};
         image_button l_advisor_a = {40, 0, 28, 28, IB_NORMAL, GROUP_MESSAGE_ADVISOR_BUTTONS, 9, button_advisor, button_none, ADVISOR_RATINGS, 0, 1};
         image_button l_advisor_b = {65, 0, 28, 28, IB_NORMAL, GROUP_MESSAGE_ADVISOR_BUTTONS, 9, button_advisor, button_none, ADVISOR_RATINGS, 0, 1};
     } buttons;
@@ -783,9 +782,10 @@ static void draw_foreground() {
     }
 
     if (context.go_to_advisor.first) {
-        g_building_info.buttons.advisor.parameter1 = context.go_to_advisor.first;
-        g_building_info.buttons.advisor.image_offset = (context.go_to_advisor.first - 1) * 3;
-        image_buttons_draw(context.offset + vec2i(0, 16 * context.height_blocks - 40), g_building_info.buttons.advisor);
+        ui::img_button(GROUP_MESSAGE_ADVISOR_BUTTONS, vec2i(0, 16 * context.height_blocks - 40), {28, 28}, (context.go_to_advisor.first - 1) * 3)
+            .onclick([&context] (int, int) {
+                window_advisors_show_advisor(context.go_to_advisor.first);
+            });
     }
 
     if (context.go_to_advisor.left_a) {
@@ -915,9 +915,9 @@ static void handle_input(const mouse* m, const hotkeys* h) {
                                                 g_building_info.image_buttons_help_close, g_building_info.image_button_id);
     }
 
-    if (context.go_to_advisor.first) {
-        button_id |= image_buttons_handle_mouse(m, context.offset + vec2i(0, 16 * context.height_blocks - 40), g_building_info.buttons.advisor, tmp_btn_id);
-    }
+    //if (context.go_to_advisor.first) {
+    //    button_id |= image_buttons_handle_mouse(m, context.offset + vec2i(0, 16 * context.height_blocks - 40), g_building_info.buttons.advisor, tmp_btn_id);
+    //}
 
     if (context.go_to_advisor.left_a) {
         button_id |= image_buttons_handle_mouse(m, context.offset + vec2i(0, 16 * context.height_blocks - 40), g_building_info.buttons.l_advisor_a, tmp_btn_id);