ui: redesigned extra sidebar widget

Author: dalerank

src/core/encoding/korean.cpp

@@ -844,8 +844,7 @@ void encoding_korean_to_utf8(const uint8_t* input, char* output, int output_leng
             // multi-byte char
             // TODO narrow conversion here to fix or correctly static_cast
             const korean_entry key = {input[0] << 8 | input[1]};
-            const korean_entry* entry = (korean_entry*)bsearch(
-              &key, codepage_to_utf8, IMAGE_FONT_MULTIBYTE_KOREAN_MAX_CHARS, sizeof(korean_entry), compare_codepage);
+            const korean_entry* entry = (korean_entry*)bsearch(&key, codepage_to_utf8, IMAGE_FONT_MULTIBYTE_KOREAN_MAX_CHARS, sizeof(korean_entry), compare_codepage);
             if (entry && output + 3 <= max_output) {
                 for (int i = 0; i < 3; i++) {
                     *output = entry->utf8[i];

src/scripts/common.js

@@ -212,6 +212,7 @@ var advisor_financial_window = {}
 var display_options_window = {}
 var sidebar_window_expanded = {}
 var sidebar_window_collapsed = {}
+var sidebar_window_extra = {}
 var info_window_booth = {}
 
 //figures

src/scripts/ui.js

@@ -850,7 +850,38 @@ hold_festival_window = {
 	}
 }
 
+sidebar_window_extra = {
+  ui : {
+  	background : inner_panel({pos:[0, 480], size:[10, 19]}),
+
+		speed_header: text({pos:[11, 485], text:[45, 2], font:FONT_NORMAL_WHITE_ON_DARK}), 
+		speed_current: text({pos:[65, 480 + 28], font:FONT_NORMAL_WHITE_ON_DARK}), 
+  	dec_speed  : arrowdown({pos:[11, 470 + 30], tiny:false}),
+		inc_speed  : arrowup({pos:[35, 470 + 30], tiny:false}),
+
+		unemp_header: text({pos:[11, 480 + 50], text:[68, 135], font:FONT_NORMAL_WHITE_ON_DARK}), 
+		unemp_current: text({pos:[11, 480 + 70], font:FONT_NORMAL_WHITE_ON_DARK}), 
+
+		population_header: text({pos:[11, 480 + 90], font:FONT_NORMAL_WHITE_ON_DARK}), 
+		population_current: text({pos:[11, 480 + 110]}), 
+
+		culture_header: text({pos:[11, 480 + 130], font:FONT_NORMAL_WHITE_ON_DARK}), 
+		culture_current: text({pos:[11, 480 + 150]}),
+
+		prosperity_header: text({pos:[11, 480 + 170], font:FONT_NORMAL_WHITE_ON_DARK}), 
+		prosperity_current: text({pos:[11, 480 + 190]}), 
+
+		monument_header: text({pos:[11, 480 + 210], font:FONT_NORMAL_WHITE_ON_DARK}), 
+		monument_current: text({pos:[11, 480 + 230]}), 
+
+		kingdom_header: text({pos:[11, 480 + 250], font:FONT_NORMAL_WHITE_ON_DARK}), 
+		kingdom_current: text({pos:[11, 480 + 270]}), 
+  }
+}
+
 sidebar_window_collapsed = {
+	extra_block 	 	 : {pack:PACK_GENERAL, id:121, offset:1},
+	relief_block 	 	 : {pack:PACK_GENERAL, id:121, offset:5},
 	expanded_offset_x: 42,
 	deceleration_offset_x : 5,
   slide_acceleration_millis : 65, 
@@ -881,6 +912,7 @@ sidebar_window_collapsed = {
 
 sidebar_window_expanded = {
 	extra_block 	 	 : {pack:PACK_GENERAL, id:121, offset:2},
+	relief_block 	 	 : {pack:PACK_GENERAL, id:121, offset:4},
 	extra_block_x 	 : -24,
 	expanded_offset_x: 186,
 	deceleration_offset_x : 125,

src/widget/sidebar/common.cpp

@@ -11,16 +11,14 @@ int sidebar_common_get_height() {
     return screen_height() - TOP_MENU_HEIGHT;
 }
 
-void sidebar_common_draw_relief(int x_offset, int y_offset, image_desc desc, bool is_collapsed) {
+void sidebar_common_draw_relief(vec2i offset, image_desc desc) {
     painter ctx = game.painter();
-    // relief images below panel
 
-    int image_base = image_group(desc);
-    int image_offset = desc.id == 121 ? 2 : 1; // GROUP_SIDE_PANEL
+    int image_id = image_group(desc);
     int y_max = screen_height();
 
-    while (y_offset < y_max) {
-        ImageDraw::img_generic(ctx, image_base + image_offset + image_offset + is_collapsed, x_offset, y_offset + 6);
-        y_offset += 285;
+    while (offset.y < y_max) {
+        ImageDraw::img_generic(ctx, image_id, offset.x, offset.y + 6);
+        offset.y += 285;
     }
 }

src/widget/sidebar/common.h

@@ -6,5 +6,5 @@
 #define SIDEBAR_MAIN_SECTION_HEIGHT 450
 
 int sidebar_common_get_height(void);
-void sidebar_common_draw_relief(int x_offset, int y_offset, image_desc desc, bool is_collapsed);
+void sidebar_common_draw_relief(vec2i offset, image_desc desc);
 

src/widget/sidebar/editor.cpp

@@ -141,7 +141,7 @@ void widget_sidebar_editor_draw_background() {
     draw_buttons();
     widget_minimap_draw({x_offset + 8, MINIMAP_Y_OFFSET}, 1);
     draw_status();
-    sidebar_common_draw_relief(x_offset, SIDEBAR_MAIN_SECTION_HEIGHT + TOP_MENU_HEIGHT, side_panel, 0);
+    sidebar_common_draw_relief({ x_offset, SIDEBAR_MAIN_SECTION_HEIGHT + TOP_MENU_HEIGHT }, side_panel);
 }
 
 void widget_sidebar_editor_draw_foreground(void) {