ui: correct slide top menu bar

Author: dalerank

src/io/gamestate/boilerplate.cpp

@@ -61,7 +61,7 @@
 #include "scenario/request.h"
 #include "sound/sound_city.h"
 #include "sound/sound.h"
-#include "widget/top_menu_game.h"
+#include "widget/widget_top_menu_game.h"
 #include "window/window_city.h"
 #include "window/file_dialog.h"
 #include "window/mission_briefing.h"

src/scripts/ui.js

@@ -47,6 +47,7 @@ top_menu_bar = {
 	offset : [10, 6],
 	item_height : 20,
 	background: IMG_TOP_MENU_BACKGROUND,
+	sidebar_offset : 158,
 	spacing : 32,
 	offset_funds_basic : 540,
 	offset_population_basic : 400,

src/widget/widget_sidebar.cpp

@@ -32,6 +32,7 @@
 #include "window/message_list.h"
 #include "window/mission_briefing.h"
 #include "window/overlay_menu.h"
+#include "widget/widget_top_menu_game.h"
 #include "sound/sound.h"
 #include "game/game.h"
 
@@ -206,6 +207,7 @@ void ui::sidebar_window_expanded::ui_draw_foreground() {
             }
             x_offset += rel_offset;
         }
+        widget_top_menu_draw(true);
     } else {
         x_offset -= expanded_offset_x;
     }
@@ -316,6 +318,7 @@ void ui::sidebar_window_collapsed::ui_draw_foreground() {
             }
             x_offset += rel_offset;
         }
+        widget_top_menu_draw(true);
     } else {
         x_offset -= expanded_offset_x;
     }

src/widget/top_menu_game.cpp src/widget/widget_top_menu_game.cpp

@@ -1,4 +1,4 @@
-#include "top_menu_game.h"
+#include "widget_top_menu_game.h"
 
 #include "game/game.h"
 
@@ -76,6 +76,7 @@ struct top_menu_data_t {
     vec2i offset;
     int item_height;
     int spacing;
+    int sidebar_offset;
     e_image_id background;
 
     ui::widget headers;
@@ -144,6 +145,7 @@ void config_load_top_menu_bar() {
         data.offset_population_basic = arch.r_int("offset_population_basic");
         data.offset_date_basic = arch.r_int("offset_date_basic");
         data.offset_rotate_basic = arch.r_int("offset_rotate_basic");
+        data.sidebar_offset = arch.r_int("sidebar_offset");
 
         data.headers.load(arch, "headers");
         for (auto &header : data.headers.elements) {
@@ -635,13 +637,13 @@ static void widget_top_menu_init() {
     set_text_for_debug_render();
 }
 
-static void top_menu_draw_background() {
+static void widget_sub_menu_draw_background() {
     window_city_draw_panels();
     window_city_draw();
     widget_sidebar_city_draw_foreground();
 }
 
-static void top_menu_draw_foreground() {
+static void widget_sub_menu_draw_foreground() {
     auto& data = g_top_menu_data;
     if (!data.open_sub_menu) {
         return;
@@ -650,11 +652,11 @@ static void top_menu_draw_foreground() {
     top_menu_menu_draw(data.open_sub_menu, data.focus_sub_menu_id);
 }
 
-void widget_top_menu_show() {
+void widget_sub_menu_show() {
     static window_type window = {
         WINDOW_TOP_MENU,
-        top_menu_draw_background,
-        top_menu_draw_foreground,
+        widget_sub_menu_draw_background,
+        widget_sub_menu_draw_foreground,
         widget_top_menu_handle_input
     };
     widget_top_menu_init();
@@ -666,18 +668,16 @@ int orientation_button_pressed = 0;
 
 void wdiget_top_menu_draw_background() {
     painter ctx = game.painter();
-    int block_width = 96;
-    int s_width = screen_width();
-
-    int s_end = s_width - 1000 - 24 + city_view_is_sidebar_collapsed() * (162 - 18);
-    int s_start = s_end - ceil((float)s_end / (float)block_width) * block_width;
 
     int img_id = image_group(g_top_menu_data.background);
-    for (int i = 0; s_start + i * block_width < s_end; i++) {
-       ImageDraw::img_generic(ctx, img_id, s_start + (i * block_width), COLOR_MASK_NONE);
+    const image_t *img = image_get(img_id);
+    const int block_width = img->width;
+
+    for (int x = -(screen_width() - widget_sidebar_city_offset_x()); x < screen_width(); x += (block_width - g_top_menu_data.sidebar_offset)) {
+       ImageDraw::img_generic(ctx, img_id, x, 0);
     }
 
-    ImageDraw::img_generic(ctx, img_id, s_end, 0);
+    ImageDraw::img_generic(ctx, img_id, widget_sidebar_city_offset_x() - block_width + g_top_menu_data.sidebar_offset, 0);
 }
 
 void widget_top_menu_draw(int force) {
@@ -818,7 +818,7 @@ static bool widget_top_menu_handle_mouse_menu(const mouse* m) {
     xstring menu_id = top_menu_bar_handle_mouse(m);
     if (!!menu_id && m->left.went_up) {
         data.open_sub_menu = menu_id;
-        widget_top_menu_show();
+        widget_sub_menu_show();
         return true;
     }
 

src/widget/top_menu_game.h src/widget/widget_top_menu_game.h

@@ -25,7 +25,7 @@
 #include "scenario/scenario.h"
 #include "scenario/criteria.h"
 #include "widget/widget_sidebar.h"
-#include "widget/top_menu_game.h"
+#include "widget/widget_top_menu_game.h"
 #include "widget/widget_city.h"
 #include "window/advisors.h"
 #include "window/file_dialog.h"
@@ -41,7 +41,7 @@ static int center_in_city(int element_width_pixels) {
 
 void window_city_draw_background() {
     OZZY_PROFILER_SECTION("Render/Frame/Window/City/Bakground");
-    widget_top_menu_draw(1);
+    widget_top_menu_draw(true);
 }
 
 void window_city_draw_paused_and_time_left() {
@@ -93,7 +93,7 @@ static void draw_cancel_construction() {
 
 static void window_city_draw_foreground() {
     //    clear_city_view(0);
-    widget_top_menu_draw(0);
+    widget_top_menu_draw(false);
     window_city_draw();
     widget_sidebar_city_draw_foreground();
     if (window_is(WINDOW_CITY) || window_is(WINDOW_CITY_MILITARY)) {

src/window/window_city.cpp

@@ -4,7 +4,7 @@
 #include "city/warning.h"
 #include "widget/widget_city.h"
 #include "widget/minimap.h"
-#include "widget/top_menu_game.h"
+#include "widget/widget_top_menu_game.h"
 #include "widget/sidebar/common.h"
 #include "widget/widget_sidebar.h"
 #include "graphics/window.h"
@@ -73,7 +73,7 @@ void handle_input_military(const mouse* m, const hotkeys* h) {
 }
 
 void draw_foreground_military() {
-    widget_top_menu_draw(0);
+    widget_top_menu_draw(false);
     window_city_draw();
     widget_sidebar_city_draw_foreground_military();
     window_city_draw_paused_and_time_left();