ui: add salary button to personal mansion info window

Author: s.kushnirenko

src/building/building.h

@@ -20,6 +20,7 @@ class io_buffer;
 class building;
 struct object_info;
 struct painter;
+struct mouse;
 
 constexpr uint32_t MAX_BUILDINGS = 4000;
 constexpr uint32_t MAX_FIGURES_PER_BUILDING = 8;
@@ -388,6 +389,7 @@ class building_impl {
     virtual void update_day() {}
     virtual void window_info_background(object_info &ctx) {}
     virtual void window_info_foreground(object_info &ctx) {}
+    virtual int window_info_handle_mouse(const mouse *m, object_info &c) { return 0; }
     virtual bool draw_ornaments_and_animations_height(vec2i point, tile2i tile, painter &ctx);
     virtual e_overlay get_overlay() const { return OVERLAY_NONE; }
     virtual bool need_road_access() const { return true; }

src/building/building_mansion.cpp

@@ -3,11 +3,47 @@
 #include "window/building/common.h"
 #include "graphics/elements/panel.h"
 #include "graphics/elements/lang_text.h"
+#include "graphics/text.h"
+#include "graphics/elements/button.h"
+#include "graphics/elements/generic_button.h"
+#include "city/emperor.h"
+#include "city/victory.h"
+#include "city/finance.h"
+#include "city/ratings.h"
+
+struct window_info_mansion {
+    int focus_button_id;
+};
+
+static void button_set_salary(int rank, int param2) {
+    if (!city_victory_has_won()) {
+        city_emperor_set_salary_rank(rank);
+        city_finance_update_salary();
+        city_ratings_update_kingdom_explanation();
+        //window_advisors_show();
+    }
+}
+
+window_info_mansion g_window_info_mansion;
+
+static generic_button imperial_buttons[] = {
+    {40, 90, 400, 20, button_set_salary, button_none, 0, 0},
+};
 
 void building_mansion::window_info_background(object_info &c) {
     c.help_id = 78;
+    c.go_to_advisor.left_a = ADVISOR_IMPERIAL;
     window_building_play_sound(&c, "wavs/gov_palace.wav");
     outer_panel_draw(c.offset, c.width_blocks, c.height_blocks);
     lang_text_draw_centered(103, 0, c.offset.x, c.offset.y + 10, 16 * c.width_blocks, FONT_LARGE_BLACK_ON_LIGHT);
     window_building_draw_description_at(c, 16 * c.height_blocks - 143, 103, 1);
-}
+
+    button_border_draw(c.offset.x + 40, c.offset.y + 90, 400, 20, g_window_info_mansion.focus_button_id == 2);
+    int width = lang_text_draw(52, city_emperor_salary_rank() + 4, c.offset.x + 40, c.offset.y + 94, FONT_NORMAL_WHITE_ON_DARK);
+    width += text_draw_number(city_emperor_salary_amount(), '@', " ", c.offset.x + 40 + width, c.offset.y + 94, FONT_NORMAL_WHITE_ON_DARK);
+    lang_text_draw(52, 3, c.offset.x + 40 + width, c.offset.y + 94, FONT_NORMAL_WHITE_ON_DARK);
+}
+
+int building_mansion::window_info_handle_mouse(const mouse *m, object_info &c) {
+    return generic_buttons_handle_mouse(m, 0, 0, imperial_buttons, 8, &g_window_info_mansion.focus_button_id);
+}

src/building/building_mansion.h

@@ -6,5 +6,6 @@ class building_mansion : public building_impl {
 public:
     building_mansion(building &b) : building_impl(b) {}
     virtual void window_info_background(object_info &ctx) override;
+    virtual int window_info_handle_mouse(const mouse *m, object_info &c) override;
     virtual e_sound_channel_city sound_channel() const override { return SOUND_CHANNEL_CITY_MANSION; }
 };

src/window/advisor/imperial.cpp src/window/advisor/advisor_imperial.cpp

@@ -1,4 +1,4 @@
-#include "imperial.h"
+#include "advisor_imperial.h"
 #include "city/city_data.h"
 
 #include "city/emperor.h"
@@ -78,6 +78,7 @@ static int get_request_status(int index) {
     }
     return 0;
 }
+
 static void draw_request(int index, const scenario_request* request) {
     if (index >= 5) {
         return;
@@ -162,6 +163,7 @@ static int draw_background(void) {
 
     return ADVISOR_HEIGHT;
 }
+
 static void draw_foreground(void) {
     inner_panel_draw(64, 324, 32, 6);
 
@@ -170,9 +172,11 @@ static void draw_foreground(void) {
     int width = lang_text_draw(52, 1, 72, 372, FONT_NORMAL_WHITE_ON_DARK);
     text_draw_money(city_emperor_personal_savings(), 80 + width, 372, FONT_NORMAL_WHITE_ON_DARK);
 
+    //
     button_border_draw(320, 367, 250, 20, focus_button_id == 1);
     lang_text_draw_centered(52, 2, 320, 372, 250, FONT_NORMAL_WHITE_ON_DARK);
 
+    // button set salary
     button_border_draw(70, 393, 500, 20, focus_button_id == 2);
     width = lang_text_draw(52, city_emperor_salary_rank() + 4, 120, 398, FONT_NORMAL_WHITE_ON_DARK);
     width += text_draw_number(city_emperor_salary_amount(), '@', " ", 120 + width, 398, FONT_NORMAL_WHITE_ON_DARK);

src/window/advisor/advisor_imperial.h

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

src/window/advisor/imperial.h

@@ -26,7 +26,7 @@
 #include "window/advisor/financial.h"
 #include "window/advisor/advisor_health.h"
 #include "window/advisor/housing.h"
-#include "window/advisor/imperial.h"
+#include "window/advisor/advisor_imperial.h"
 #include "window/advisor/labor.h"
 #include "window/advisor/military.h"
 #include "window/advisor/monuments.h"
@@ -131,6 +131,7 @@ static void set_advisor_window() {
         data.current_advisor_window = nullptr;
     }
 }
+
 static void set_advisor(int advisor) {
     auto &data = g_window_advisors;
     data.current_advisor = advisor;
@@ -201,6 +202,7 @@ static void draw_background(void) {
     data.advisor_height = data.current_advisor_window->draw_background();
     graphics_reset_dialog();
 }
+
 static void draw_foreground(void) {
     auto &data = g_window_advisors;
     graphics_set_to_dialog();

src/window/advisors.cpp

@@ -868,6 +868,7 @@ static int handle_specific_building_info_mouse(const mouse *m) {
     } else if (context.figure.drawn) {
         return window_building_handle_mouse_figure_list(m, &context);
     } else if (context.type == BUILDING_INFO_BUILDING) {
+        building *b = building_get(context.building_id);
         switch (building_get(context.building_id)->type) {
         case BUILDING_BAZAAR:
             if (context.storage_show_special_orders)
@@ -906,6 +907,9 @@ static int handle_specific_building_info_mouse(const mouse *m) {
             else
                 window_building_handle_mouse_warehouse(m, &context);
             break;
+
+        default:
+            b->dcast()->window_info_handle_mouse(m, context);
         }
     }
     return 0;