ui: redesigned trade prices window

Author: dalerank

src/empire/empire_map.cpp

@@ -55,6 +55,7 @@ void empire_load_editor(int empire_id, int viewport_width, int viewport_height)
     //    }
     //    check_scroll_boundaries();
 }
+
 void empire_map_t::init_scenario() {
     scroll_x = initial_scroll_x;
     scroll_y = initial_scroll_y;

src/empire/trade_prices.cpp

@@ -11,14 +11,14 @@ struct trade_price {
 
 static const struct trade_price DEFAULT_PRICES[RESOURCES_MAX] = {
   {0, 0},
-  {28, 21}, // grain
-  {47, 35},             // meat
-  {33, 25},             // lettuce
-  {33, 25},             // chickpeas
-  {33, 25},             // pomegranates
-  {33, 25},             // figs
-  {42, 33},             // fish
-  {44, 34},             // gamemeat
+  {28, 21},   // grain
+  {47, 35},   // meat
+  {33, 25},   // lettuce
+  {33, 25},   // chickpeas
+  {33, 25},   // pomegranates
+  {33, 25},   // figs
+  {42, 33},   // fish
+  {44, 34},   // gamemeat
 
   {21, 16},   // straw
   {325, 275}, // weapons
@@ -56,6 +56,7 @@ void trade_prices_reset(void) {
         prices[i] = DEFAULT_PRICES[i];
     }
 }
+
 int trade_price_change(int resource, int amount) {
     if (amount < 0 && prices[resource].sell <= 0) {
         // cannot lower the price to negative
@@ -74,14 +75,12 @@ int trade_price_change(int resource, int amount) {
 int trade_price_buy(int resource) {
     return prices[resource].buy;
 }
+
 int trade_price_sell(int resource, int bonus_inclusion) {
     switch (bonus_inclusion) {
-    case PRICE_WITH_BONUS:
-        return prices[resource].sell * (city_data.religion.ra_150_export_profits_months_left > 0 ? 1.5f : 1.0f);
-    case PRICE_ONLY_BASE:
-        return prices[resource].sell;
-    case PRICE_ONLY_BONUS:
-        return prices[resource].sell * (city_data.religion.ra_150_export_profits_months_left > 0 ? 0.5f : 0.0f);
+    case PRICE_WITH_BONUS: return prices[resource].sell * (city_data.religion.ra_150_export_profits_months_left > 0 ? 1.5f : 1.0f);
+    case PRICE_ONLY_BASE: return prices[resource].sell;
+    case PRICE_ONLY_BONUS: return prices[resource].sell * (city_data.religion.ra_150_export_profits_months_left > 0 ? 0.5f : 0.0f);
     }
 
     return 999;

src/empire/trade_prices.h

@@ -1,39 +1,10 @@
-#ifndef EMPIRE_TRADE_PRICES_H
-#define EMPIRE_TRADE_PRICES_H
+#pragma once
 
 #include "core/buffer.h"
 #include "game/resource.h"
 
-/**
- * @file
- * Trade prices.
- */
-
-/**
- * Reset trade prices to the default
- */
-void trade_prices_reset(void);
-
-/**
- * Get the buy price for the resource
- * @param resource Resource
- */
+void trade_prices_reset();
 int trade_price_buy(int resource);
-
 enum { PRICE_WITH_BONUS, PRICE_ONLY_BASE, PRICE_ONLY_BONUS };
-
-/**
- * Get the sell price for the resource
- * @param resource Resource
- */
 int trade_price_sell(int resource, int bonus_inclusion = PRICE_WITH_BONUS);
-
-/**
- * Change the trade price for resource by amount
- * @param resource Resource to change
- * @param amount Amount to change, can be positive or negative
- * @return True if the price has been changed
- */
-int trade_price_change(int resource, int amount);
-
-#endif // EMPIRE_TRADE_PRICES_H
+int trade_price_change(int resource, int amount);

src/scripts/common.js

@@ -131,6 +131,7 @@ var building_mud_tower = {}
 var building_road = {}
 var building_burning_ruin = {}
 var building_marble_quarry = {}
+var trade_prices_window = {}
 
 // houses
 var building_house_crude_hut = {}

src/window/trade_prices.cpp

@@ -11,35 +11,86 @@
 #include "graphics/window.h"
 #include "input/input.h"
 #include "window/advisors.h"
+#include "window/autoconfig_window.h"
 #include "io/gamefiles/lang.h"
 #include "game/game.h"
 
-static void draw_background() {
+struct trade_prices_window : autoconfig_window_t<trade_prices_window> {
+    virtual int handle_mouse(const mouse *m) override { return 0; }
+    virtual int get_tooltip_text() override { return 0; }
+    virtual void draw_foreground() override {}
+    virtual int draw_background() override;
+    virtual void ui_draw_foreground() override;
+    virtual int ui_handle_mouse(const mouse *m) override;
+    virtual void init() {}
+
+    virtual void load(archive arch, pcstr section) override {
+        autoconfig_window::load(arch, section);
+
+        next_row_offset = arch.r_vec2i("next_row_offset");
+        next_item_offset = arch.r_vec2i("next_item_offset");
+        receive_offset = arch.r_vec2i("receive_offset");
+        buyer_offset = arch.r_vec2i("buyer_offset");
+        next = arch.r_int("next");
+    }
+
+    vec2i next_row_offset;
+    vec2i next_item_offset;
+    vec2i receive_offset;
+    vec2i buyer_offset;
+    int next;
+};
+
+trade_prices_window trade_prices_w;
+
+int trade_prices_window::draw_background() {
     window_draw_underlying_window();
 
-    graphics_set_to_dialog();
+    return 0;
+}
+
+void trade_prices_window::ui_draw_foreground() {
+    ui.begin_widget(ui.pos);
+    ui.draw();
 
-    graphics_shade_rect(vec2i{33, 53}, vec2i{574, 334}, 0x80);
-    outer_panel_draw(vec2i{16, 144}, 38, 11);
-    lang_text_draw(54, 21, 26, 153, FONT_LARGE_BLACK_ON_LIGHT);
-    lang_text_draw(54, 22, 26, 228, FONT_NORMAL_BLACK_ON_LIGHT);
-    lang_text_draw(54, 23, 26, 253, FONT_NORMAL_BLACK_ON_LIGHT);
+    vec2i items_pos = ui["items"].pos;
+    vec2i current_pos = items_pos;
+    int start_i = 0;
+    for (int i = 1; (start_i + i) < RESOURCES_MAX; i++) {
+        int image_offset = i;
+        if (i >= next) {
+            start_i += next;
+            i = 0;
+            items_pos += next_row_offset;
+            current_pos = items_pos;
+        }
 
-    painter ctx = game.painter();
-    for (int i = 1; i < 16; i++) {
-        int image_offset = i + resource_image_offset(i, RESOURCE_IMAGE_ICON);
-        ImageDraw::img_generic(ctx, image_id_resource_icon(image_offset), vec2i{126 + 30 * i, 194});
-        text_draw_number_centered(trade_price_buy(i), 120 + 30 * i, 229, 30, FONT_SMALL_OUTLINED);
-        text_draw_number_centered(trade_price_sell(i), 120 + 30 * i, 254, 30, FONT_SMALL_OUTLINED);
+        e_resource resource = e_resource(start_i + i);
+        if (resource == RESOURCE_UNUSED12) {
+            continue;
+        }
+
+        ui.icon(current_pos, resource);
+
+        const int buy_price = trade_price_buy(i);
+        const int sell_price = trade_price_sell(i);
+        ui.label(bstring32(buy_price), current_pos + buyer_offset , FONT_NORMAL_BLACK_ON_LIGHT);
+        ui.label(bstring32(sell_price), current_pos + receive_offset, FONT_NORMAL_BLACK_ON_LIGHT);
+
+        current_pos += next_item_offset;
     }
-    lang_text_draw_centered(13, 1, 16, 296, 608, FONT_NORMAL_BLACK_ON_LIGHT);
 
-    graphics_reset_dialog();
+    ui.end_widget();
 }
 
-static void handle_input(const mouse* m, const hotkeys* h) {
-    if (input_go_back_requested(m, h))
+int trade_prices_window::ui_handle_mouse(const mouse *m) {
+    const hotkeys *h = hotkey_state();
+    if (input_go_back_requested(m, h)) {
         window_advisors_show();
+        return 0;
+    }
+
+    return autoconfig_window::ui_handle_mouse(m);
 }
 
 static int get_tooltip_resource(tooltip_context* c) {
@@ -68,10 +119,11 @@ static void get_tooltip(tooltip_context* c) {
 void window_trade_prices_show(void) {
     static window_type window = {
         WINDOW_TRADE_PRICES,
-        draw_background,
-        0,
-        handle_input,
-        get_tooltip
+        [] { trade_prices_w.draw_background(); },
+        [] { trade_prices_w.ui_draw_foreground(); },
+        [] (const mouse *m, const hotkeys *h) { trade_prices_w.ui_handle_mouse(m); },
+        nullptr
     };
+
     window_show(&window);
 }

src/window/trade_prices.h

@@ -1,6 +1,3 @@
-#ifndef WINDOW_TRADE_PRICES_H
-#define WINDOW_TRADE_PRICES_H
+#pragma once
 
-void window_trade_prices_show(void);
-
-#endif // WINDOW_TRADE_PRICES_H
+void window_trade_prices_show();