ui: update_buttons() moved to window_draw_background()

Author: dalerank

src/city/object_info.h

@@ -5,6 +5,7 @@
 #include "grid/point.h"
 #include "core/vec2i.h"
 #include "city/constants.h"
+#include "overlays/city_overlay_fwd.h"
 #include "core/svector.h"
 
 enum terrain_info_type {
@@ -68,7 +69,7 @@ struct object_info {
     int warehouse_space_text;
     common_info_window *ui = nullptr;
     terrain_info_type terrain_type;
-    int show_overlay;
+    e_overlay show_overlay;
     struct {
         e_advisor first = ADVISOR_NONE;
         e_advisor left_a = ADVISOR_NONE;

src/window/window_building_info.cpp

@@ -112,6 +112,30 @@ void building_info_window::fill_employment_details(object_info &c, int text_id)
 }
 
 void building_info_window::window_info_background(object_info &c) {
+    common_info_window::window_info_background(c);
+
+    building *b = building_get(c);
+    b->dcast()->window_info_background(c);
+
+    update_buttons(c);
+}
+
+textid building_info_window::get_tooltip(object_info &c) {
+    common_info_window::init(c);
+
+    if (!c.storage_show_special_orders) {
+        return {0, 0};
+    }
+
+    building *b = building_get(c);
+    if (b->type == BUILDING_STORAGE_YARD) {
+        return window_building_get_tooltip_warehouse_orders();
+    }
+
+    return b->dcast()->get_tooltip();
+}
+
+void building_info_window::init(object_info &c) {
     g_debug_building_id = c.building_id;
     building *b = building_get(c);
 
@@ -176,25 +200,11 @@ void building_info_window::window_info_background(object_info &c) {
     c.help_id = params.meta.help_id;
     c.group_id = params.meta.text_id;
 
-    ui["title"] = ui::str(c.group_id, 0);
-
-    common_info_window::window_info_background(c);
-}
-
-textid building_info_window::get_tooltip(object_info &c) {
-    if (!c.storage_show_special_orders) {
-        return {0, 0};
-    }
-
-    building *b = building_get(c);
-    if (b->type == BUILDING_STORAGE_YARD) {
-        return window_building_get_tooltip_warehouse_orders();
-    }
-
-    return b->dcast()->get_tooltip();
+    ui["title"] = ui::str(28, b->type);
 }
 
 void building_info_window::update_buttons(object_info &c) {
+    common_info_window::update_buttons(c);
     building *b = building_get(c);
 
     int workers_needed = model_get_building(b->type)->laborers;
@@ -233,8 +243,6 @@ void building_info_window::update_buttons(object_info &c) {
         }
         window_invalidate();
     });
-
-    common_info_window::update_buttons(c);
 }
 
 building *building_info_window::building_get(object_info &c) {

src/window/window_building_info.h

@@ -17,7 +17,8 @@ struct building_info_window : public common_info_window {
     virtual void window_info_foreground(object_info &c) override;
     virtual void window_info_background(object_info &c) override;
     virtual textid get_tooltip(object_info &c) override;
-
+    
+    virtual void init(object_info &c) override;
     virtual void update_buttons(object_info &c) override;
 
     building *building_get(object_info &c);

src/window/window_info.cpp

@@ -381,13 +381,6 @@ void common_info_window::load(archive arch, pcstr section) {
     }
 }
 
-void common_info_window::init(object_info &c) {
-    building *b = c.building_get();
-    ui["title"] = ui::str(28, b->type);
-
-    update_buttons(c);
-}
-
 void common_info_window::draw_tooltip(tooltip_context *c) {
     textid tx = get_tooltip(g_object_info);
     pcstr tooltip = (pcstr)lang_get_string(tx);

src/window/window_info.h

@@ -10,15 +10,15 @@ struct common_info_window : public ui::widget {
     virtual pcstr section() const { return ""; }
     virtual bool check(object_info &c) { return false; }
     virtual int get_height_id(object_info &c) { return 0; }
-    virtual void window_info_background(object_info &c) {}
+    virtual void window_info_background(object_info &c) { update_buttons(c); }
     virtual void window_info_foreground(object_info &c) { draw(); }
     virtual int window_info_handle_mouse(const mouse *m, object_info &c) { return 0; }
     virtual textid get_tooltip(object_info &c) { return {0, 0}; }
     virtual void update_buttons(object_info &c);
 
     using widget::load;
     virtual void load(archive arch, pcstr section) override;
-    virtual void init(object_info &c);
+    virtual void init(object_info &c) {}
 
     void draw_tooltip(tooltip_context *c);
 };