ui: split bazaar info window for orders/common parts

Author: dalerank

src/graphics/elements/ui.cpp

@@ -626,6 +626,11 @@ void ui::widget::load(pcstr section) {
     });
 }
 
+bool ui::widget::contains(const xstring &id) const {
+    auto it = std::find_if(elements.begin(), elements.end(), [xid = xstring(id)] (const auto &e) { return e->id == xid; });
+    return (it != elements.end());
+}
+
 ui::element& ui::widget::operator[](pcstr id) {
     auto it = std::find_if(elements.begin(), elements.end(), [xid = xstring(id)] (const auto &e) { return e->id == xid; });
     if (it == elements.end()) {

src/graphics/elements/ui.h

@@ -364,6 +364,7 @@ struct widget {
 
     widget() : ui(*this) {}
 
+    bool contains(const xstring &id) const;
     element& operator[](pcstr id);
     inline element &operator[](const bstring32 &id) { return (*this)[id.c_str()]; }
     inline element &operator[](const xstring &id) { return (*this)[id.c_str()]; }

src/scripts/ui.js

@@ -851,12 +851,11 @@ bazaar_orders_window = {
 		orders_panel : inner_panel({pos : [16, 42], size: [27, 10] }),
 		button_help  : image_button({margin:{left:14, bottom:-40}, size:[27, 27], pack:PACK_GENERAL, id:134 }),
 		button_close  : image_button({margin:{right:-40, bottom:-40}, size:[27, 27], pack:PACK_GENERAL, id:134, offset:4 }),
-		empty_all : button({pos:[80, -1], size:[300, 24], margin:{bottom:-64} }),
 		accept_none : button({pos:[80, -1], size:[300, 24], text:{group:99, id:7}, margin:{bottom:-38} }),
 
 		item_orders_column : dummy({margin:{centerx:0}}),
-		item_arrows_column : dummy({margin:{centerx:-36}}),
 		item_icon_column : dummy({pos:[25, 0]}),
+		item_name_column : dummy({pos:[55, 0]}),
 		item_row     : dummy({size:[px(13), 20]}),      
 		items_area	 : dummy({pos:[0, 50]}), 
 	}

src/window/building/distribution.cpp

@@ -140,64 +140,62 @@ uint8_t granary_3quarters_button_text[] = "18";
 uint8_t granary_half_button_text[] = "12";
 uint8_t granary_quarter_button_text[] = "6";
 
-std::pair<bstring64, e_font> window_building_get_order_instruction(int instr_kind, const storage_t *storage, e_resource resource, int market_order) {
-    if (storage != nullptr) {
-        switch (storage->resource_state[resource]) {
-        case STORAGE_STATE_PHARAOH_ACCEPT:
-        {
-            int max_accept = storage->resource_max_accept[resource];
-            bstring64 text;
-            text.printf("%d", max_accept);
-
-            if (max_accept == 3200) { text = ui::str(99, 28); }
-            else if (max_accept == 2400) { text = ui::str(99, 27); }
-            else if (max_accept == 1600) { text = ui::str(99, 26); }
-            else if (max_accept == 800) { text = ui::str(99, 25); }
-
-            pcstr adv_text = "";
-            if (max_accept == 2400 || max_accept == 1600 || max_accept == 800)
-                adv_text = ui::str(99, 29);
+std::pair<bstring64, e_font> window_market_get_order_instruction(int instr_kind, e_resource resource, int market_order) {
+    switch (market_order) {
+    case BAZAAR_ORDER_STATE_BUY:
+        return { ui::str(97, 8), FONT_NORMAL_WHITE_ON_DARK };
 
-            bstring64 full_text;
-            full_text.printf("%s %s %s", ui::str(99, 18), text, adv_text);
-            return { full_text, FONT_NORMAL_WHITE_ON_DARK };
-        }
-
-        case STORAGE_STATE_PHARAOH_REFUSE:
-            return { ui::str(99, 8), FONT_NORMAL_BLACK_ON_DARK };
-
-        case STORAGE_STATE_PHARAOH_GET:
-        {
-            int max_get = storage->resource_max_get[resource];
-            bstring64 text;
-            text.printf("%d", max_get);
-            if (max_get == 3200) { text = ui::str(99, 31); }
-            else if (max_get == 2400) { text = ui::str(99, 27); }
-            else if (max_get == 1600) { text = ui::str(99, 26); }
-            else if (max_get == 800) { text = ui::str(99, 25); }
-
-            pcstr adv_text = "";
-            if (max_get == 2400 || max_get == 1600 || max_get == 800)
-                adv_text = ui::str(99, 29);
+    case BAZAAR_ORDER_STATE_DONT_BUY:
+        return { ui::str(97, 9), FONT_NORMAL_BLACK_ON_DARK };
+    }
+}
 
-            bstring64 full_text;
-            full_text.printf("%s %s %s", ui::str(99, 19), text, adv_text);
-            return { full_text, FONT_NORMAL_YELLOW };
-        }
-        case STORAGE_STATE_PHARAOH_EMPTY:
-            return { ui::str(99, 21), FONT_NORMAL_BLACK_ON_DARK };
-        }
-    } else {
-        switch (market_order) {
-        case BAZAAR_ORDER_STATE_BUY:
-            return { ui::str(97, 8), FONT_NORMAL_WHITE_ON_DARK };
+std::pair<bstring64, e_font> window_building_get_order_instruction(int instr_kind, const storage_t &storage, e_resource resource) {
+    switch (storage.resource_state[resource]) {
+    case STORAGE_STATE_PHARAOH_ACCEPT: {
+        int max_accept = storage.resource_max_accept[resource];
+        bstring64 text;
+        text.printf("%d", max_accept);
+
+        if (max_accept == 3200) { text = ui::str(99, 28); }
+        else if (max_accept == 2400) { text = ui::str(99, 27); }
+        else if (max_accept == 1600) { text = ui::str(99, 26); }
+        else if (max_accept == 800) { text = ui::str(99, 25); }
+
+        pcstr adv_text = "";
+        if (max_accept == 2400 || max_accept == 1600 || max_accept == 800)
+            adv_text = ui::str(99, 29);
+
+        bstring64 full_text;
+        full_text.printf("%s %s %s", ui::str(99, 18), text, adv_text);
+        return { full_text, FONT_NORMAL_WHITE_ON_DARK };
+    }
 
-        case BAZAAR_ORDER_STATE_DONT_BUY:
-            return { ui::str(97, 9), FONT_NORMAL_BLACK_ON_DARK };
-        }
+    case STORAGE_STATE_PHARAOH_REFUSE:
+        return { ui::str(99, 8), FONT_NORMAL_BLACK_ON_DARK };
+
+    case STORAGE_STATE_PHARAOH_GET: {
+        int max_get = storage.resource_max_get[resource];
+        bstring64 text;
+        text.printf("%d", max_get);
+        if (max_get == 3200) { text = ui::str(99, 31); }
+        else if (max_get == 2400) { text = ui::str(99, 27); }
+        else if (max_get == 1600) { text = ui::str(99, 26); }
+        else if (max_get == 800) { text = ui::str(99, 25); }
+
+        pcstr adv_text = "";
+        if (max_get == 2400 || max_get == 1600 || max_get == 800)
+            adv_text = ui::str(99, 29);
+
+        bstring64 full_text;
+        full_text.printf("%s %s %s", ui::str(99, 19), text, adv_text);
+        return { full_text, FONT_NORMAL_YELLOW };
+    }
+    case STORAGE_STATE_PHARAOH_EMPTY:
+        return { ui::str(99, 21), FONT_NORMAL_BLACK_ON_DARK };
     }
 
-    return { "unknow_storage", FONT_NORMAL_BLACK_ON_DARK };
+    return { "unknown_storage", FONT_NORMAL_BLACK_ON_DARK };
 }
 
 void window_building_draw_order_instruction(int instr_kind, const storage_t* storage, e_resource resource, vec2i pos, int market_order) {

src/window/building/distribution.h

@@ -9,6 +9,7 @@ enum e_instr {
     INSTR_GRANARY = 1,
     INSTR_DOCK = 2,
     INSTR_OTHERS = 3,
+    INSTR_MARKET = 4,
 };
 
 struct window_building_distribution {
@@ -42,4 +43,6 @@ textid window_building_get_tooltip_granary_orders();
 textid window_building_get_tooltip_warehouse_orders();
 
 void window_building_draw_order_instruction(int instr_kind, const storage_t *storage, e_resource resource, vec2i pos, int market_order = -1);
-std::pair<bstring64, e_font> window_building_get_order_instruction(int instr_kind, const storage_t *storage, e_resource resource, int market_order = -1);
+
+std::pair<bstring64, e_font> window_market_get_order_instruction(int instr_kind, e_resource resource, int market_order);
+std::pair<bstring64, e_font> window_building_get_order_instruction(int instr_kind, const storage_t &storage, e_resource resource);

src/window/window_bazaar_info.cpp

@@ -24,34 +24,28 @@ struct bazaar_info_window : public building_info_window_t<bazaar_info_window>{
         resource_text_group = arch.r_int("resource_text_group");
     }
 
-    virtual void window_info_background(object_info &c) override;
-    virtual void window_info_foreground(object_info &c) override;
     virtual void init(object_info &c) override;
     virtual bool check(object_info &c) override {
         return c.building_get()->type == BUILDING_BAZAAR;
     }
-
-    void draw_simple_background(object_info &c);
-    void draw_orders_background(object_info &c);
-    void draw_orders_foreground(object_info &c);
 };
 
 bazaar_info_window g_bazaar_infow;
 
-void bazaar_info_window::draw_simple_background(object_info &c) {
-    auto bazaar = c.building_get()->dcast_bazaar();
-
-    const auto &meta = bazaar->get_info();
+void bazaar_info_window::init(object_info &c) {
+    building_info_window::init(c);
 
+    auto bazaar = c.building_get()->dcast_bazaar();
     window_building_play_sound(&c, bazaar->get_sound());
 
-    std::pair<int, int> reason = {0, 0};
+    std::pair<int, int> reason = { 0, 0 };
     if (!c.has_road_access) {
-        reason = {69, 25};
+        reason = { 69, 25 };
     }
 
+    const auto &meta = bazaar->get_info();
     if (bazaar->num_workers() <= 0) {
-        reason = {meta.text_id, 2};
+        reason = { meta.text_id, 2 };
     }
 
     if (reason.first) {
@@ -100,69 +94,8 @@ void bazaar_info_window::draw_simple_background(object_info &c) {
         ui[id_text].font(bazaar->is_good_accepted(INVENTORY_GOOD1 + i) ? FONT_NORMAL_BLACK_ON_LIGHT : FONT_NORMAL_YELLOW);
         ui[id_text].text_var(good_res ? "%u" : "", data.market.inventory[INVENTORY_GOOD1 + i]);
     }
-}
-
-void bazaar_info_window::window_info_foreground(object_info &ctx) {
-    if (ctx.storage_show_special_orders) {
-        draw_orders_foreground(ctx);
-    } else {
-        g_bazaar_infow.draw();
-    }
-}
 
-void bazaar_info_window::init(object_info &c) {
-    ui["orders"].onclick([&c] (int, int) {
-        c.storage_show_special_orders = 1;
-        window_invalidate();
+    ui["orders"].onclick([&c] {
+        window_bazaar_orders_show(c);
     });
-}
-
-void bazaar_info_window::draw_orders_foreground(object_info &c) {
-    auto &data = g_window_building_distribution;
-    draw_orders_background(c);
-    int line_x = c.offset.x + 215;
-    int y_offset = window_building_get_vertical_offset(&c, 28 - 11);
-    painter ctx = game.painter();
-
-    building_bazaar* bazaar = c.building_get()->dcast_bazaar();
-    //    backup_storage_settings(storage_id); // TODO: market state backup
-    const resource_list &resources = city_resource_get_available_market_goods();
-    for (const auto &r: resources) {
-        int i = std::distance(&*resources.begin(), &r);
-        int line_y = 20 * i;
-        int image_id = image_id_resource_icon(r.type) + resource_image_offset(r.type, RESOURCE_IMAGE_ICON);
-
-        ImageDraw::img_generic(ctx, image_id, c.offset.x + 25, y_offset + 48 + line_y);
-        lang_text_draw(23, r.type, c.offset.x + 52, y_offset + 50 + line_y, FONT_NORMAL_WHITE_ON_DARK);
-        if (data.resource_focus_button_id - 1 == i) {
-            button_border_draw(line_x - 10, y_offset + 46 + line_y, data.orders_resource_buttons[i].width, data.orders_resource_buttons[i].height, true);
-        }
-
-        // order status
-        window_building_draw_order_instruction(INSTR_STORAGE_YARD, nullptr, r.type, vec2i{ line_x, y_offset + 51 + line_y }, bazaar->is_good_accepted(i));
-    }
-
-    // accept none button
-    // button_border_draw(c->offset.x + 80, y_offset + 382 - 10 * 16, 16 * (c->width_blocks - 10), 20,
-    //                    data.orders_focus_button_id == 2 ? 1 : 0);
-    // lang_text_draw_centered(99, 7, c->offset.x + 80, y_offset + 386 - 10 * 16,
-    //                         16 * (c->width_blocks - 10), FONT_NORMAL_BLACK);
-}
-
-void bazaar_info_window::window_info_background(object_info &c) {
-    building_info_window::window_info_background(c);
-
-    if (c.storage_show_special_orders) {
-        draw_orders_background(c);
-    } else {
-        draw_simple_background(c);
-    }
-}
-
-void bazaar_info_window::draw_orders_background(object_info &c) {
-    c.help_id = 2;
-    int y_offset = window_building_get_vertical_offset(&c, 28 - 11);
-    outer_panel_draw(vec2i{c.offset.x, y_offset}, 29, 28 - 11);
-    lang_text_draw_centered(97, 7, c.offset.x, y_offset + 10, 16 * c.bgsize.x, FONT_LARGE_BLACK_ON_LIGHT);
-    inner_panel_draw(c.offset + vec2i{ 16, 42 }, { c.bgsize.x - 2, 21 - 10 });
 }

src/window/window_bazaar_orders.cpp

@@ -6,24 +6,88 @@
 #include "city/object_info.h"
 #include "city/city_resource.h"
 #include "graphics/window.h"
+#include "input/input.h"
 #include "game/game.h"
 #include "js/js_game.h"
 
 struct bazaar_orders_window : public building_info_window_t<bazaar_orders_window> {
     virtual void window_info_background(object_info &c) override;
     virtual void window_info_foreground(object_info &c) override;
+    virtual int window_info_handle_mouse(const mouse *m, object_info &c) override;
+    virtual void init(object_info &c) override;
 };
 
 bazaar_orders_window bazaar_ordersw;
 
 
 void window_bazaar_orders_show(object_info &c) {
     c.ui = &bazaar_ordersw;
-    c.ui->window_info_background(c);
+    c.ui->init(c);
+}
+
+void bazaar_orders_window::init(object_info &c) {
+    building *b = c.building_get();
+    ui["accept_none"].onclick([building_id = b->id] {
+        building_bazaar *b = ::building_get(building_id)->dcast_bazaar();
+        b->unaccept_all_goods();
+    });
+
+    ui["button_close"].onclick([grid_offset = c.grid_offset] {
+        window_info_show(tile2i(grid_offset), /*avoid_mouse*/true);
+    });
 }
 
 void bazaar_orders_window::window_info_background(object_info &c) {
+    building_info_window::window_info_background(c);
 }
 
 void bazaar_orders_window::window_info_foreground(object_info &c) {
+    building_bazaar *bazaar = c.building_get()->dcast_bazaar();
+    const int building_id = bazaar->id();
+
+    auto &data = g_window_building_distribution;
+    ui.begin_widget(c.offset);
+    ui.draw();
+    
+    painter ctx = game.painter();
+
+    //    backup_storage_settings(storage_id); // TODO: market state backup
+    const auto &items_area = ui["items_area"];
+    const auto &item_row = ui["item_row"];
+    const auto &item_icon_column = ui["item_icon_column"];
+    const auto &item_name_column = ui["item_name_column"];
+    const auto &item_orders_column = ui["item_orders_column"];
+
+    const resource_list &resources = city_resource_get_available_market_goods();
+    int row_y = 0;
+    for (const auto &r : resources) {
+        ui.icon(items_area.pos + item_icon_column.pos + vec2i{ 0, row_y }, r.type);
+        ui.label(ui::str(23, r.type), items_area.pos + item_name_column.pos + vec2i{ 0, row_y });
+
+        auto status = window_market_get_order_instruction(INSTR_MARKET, r.type, bazaar->is_good_accepted(r.type));
+        ui.button(status.first, items_area.pos + vec2i{ item_orders_column.pos.x, row_y }, item_row.size, fonts_vec{ status.second }, UiFlags_NoBody | UiFlags_AlignYCentered)
+            .onclick([building_id, resource = r.type] {
+                building_bazaar *b = ::building_get(building_id)->dcast_bazaar();
+                b->toggle_good_accepted(resource);
+            });
+
+        row_y += item_row.size.y;
+    }
+    
+    ui.end_widget();
+}
+
+int bazaar_orders_window::window_info_handle_mouse(const mouse *m, object_info &c) {
+    ui.begin_widget(c.offset, true);
+    int result = ui.handle_mouse(m);
+    ui.end_widget();
+
+    const hotkeys *h = hotkey_state();
+    if (!result && input_go_back_requested(m, h)) {
+        //storage_settings_backup_check();
+        window_go_back();
+        return -1;
+    }
+
+    return result;
 }