ui: button overlays logic moved to js config

Author: dalerank

src/scripts/ui.js

@@ -701,7 +701,7 @@ mission_briefing_window = {
 		goal_5 : { type : "label", pos:[288 + 16, 134 + 32], body : {w:15, h:1}, font : FONT_NORMAL_YELLOW, enabled: false },
 		goal_immediate : { type : "label", pos : {x:32 + 16, y:134 + 32},	body : {w:31, h:1},	font : FONT_NORMAL_YELLOW, enabled: false },
 		description_panel : { type : "inner_panel", pos : {x:32, y:200}, size: {w:33, h:14} },
-		description_text : { type : "text", pos: [40, 216], size:[px(36), px(10)], wrap:px(34), font : FONT_NORMAL_WHITE_ON_DARK, link_font:FONT_NORMAL_YELLOW, rich:true, clip_area:true },
+		description_text : { type : "text", pos: [40, 216], size:[px(36), px(10)], wrap:px(34), font : FONT_NORMAL_WHITE_ON_DARK, font_link:FONT_NORMAL_YELLOW, rich:true, clip_area:true },
 		difficulty_label : { type : "label", pos:[105, 433], size:[31, 14], font : FONT_NORMAL_BLACK_ON_LIGHT },
 		back 			: { type:"image_button", pos:[26, 428], size:[31, 20], pack:PACK_GENERAL, id:90, offset:8 },
 		start_mission : { type:"image_button", pos:[516, 430], size:[27, 27], pack:PACK_GENERAL, id:90, offset:0 },
@@ -833,7 +833,7 @@ sidebar_window = {
 		background 		 : image({pos:[0, 30], size: [29, 22], pack:PACK_GENERAL, id:121}),
 		build_image    : image({pos:[11, 211]}),
 
-		overlay_text   : text_center({pos:[15, 30], size:[117, 20]}),
+		show_overlays  : button({pos:[4, 30], size:[117, 20], border:false, font_hover:FONT_NORMAL_YELLOW }),
 
 		goto_problem 	 : image_button({pos:[86, 434], pack:PACK_GENERAL, id:136, offset:56}),
 		show_messages  : image_button({pos:[46, 434], pack:PACK_GENERAL, id:136, offset:52}),
@@ -878,8 +878,8 @@ info_window_figure_animal = {
 
 info_window_figure_caravan_donkey = {
 	ui : __baseui(figure_info_window, {
-   	bought_items   : { type : "text", pos: [40, 180], size:[px(29), px(10)], wrap:px(29), font : FONT_NORMAL_WHITE_ON_DARK, link_font:FONT_NORMAL_YELLOW, rich:true, clip_area:true },
-   	sold_items     : { type : "text", pos: [40, 210], size:[px(29), px(10)], wrap:px(29), font : FONT_NORMAL_WHITE_ON_DARK, link_font:FONT_NORMAL_YELLOW, rich:true, clip_area:true },
+   	bought_items   : { type : "text", pos: [40, 180], size:[px(29), px(10)], wrap:px(29), font : FONT_NORMAL_WHITE_ON_DARK, font_link:FONT_NORMAL_YELLOW, rich:true, clip_area:true },
+   	sold_items     : { type : "text", pos: [40, 210], size:[px(29), px(10)], wrap:px(29), font : FONT_NORMAL_WHITE_ON_DARK, font_link:FONT_NORMAL_YELLOW, rich:true, clip_area:true },
 	})
 }
 

src/widget/widget_sidebar.cpp

@@ -35,7 +35,6 @@
 
 #define MINIMAP_Y_OFFSET 59
 
-static void button_overlay(int param1, int param2);
 static void button_collapse_expand(int param1, int param2);
 static void button_build(int submenu, int param2);
 static void button_undo(int param1, int param2);
@@ -48,7 +47,6 @@ static void button_rotate(int clockwise, int param2);
 
 static image_button buttons_overlays_collapse_sidebar[2] = {
     {128, 0, 31, 20, IB_NORMAL, GROUP_SIDEBAR_UPPER_BUTTONS, 7, button_collapse_expand, button_none, 0, 0, 1},
-    {4, 3, 117, 31, IB_NORMAL, GROUP_SIDEBAR_UPPER_BUTTONS, 0, button_overlay, button_help, 0, MESSAGE_DIALOG_OVERLAYS, 1}
 };
 
 static image_button button_expand_sidebar[1] = {
@@ -111,13 +109,11 @@ static image_button buttons_top_expanded[3] = {
 ui::sidebar_window g_sidebar;
 
 void ui::sidebar_window::draw_overlay_text() {
-    const bool is_button_focused = buttons_overlays_collapse_sidebar[1].focused;
-    e_font font = is_button_focused ? FONT_NORMAL_WHITE_ON_DARK : FONT_NORMAL_BLACK_ON_LIGHT;
     pcstr overlay_text = game.current_overlay
                             ? game_state_overlay_text(game.current_overlay)
                             : ui::str(6, 4);
 
-    ui["overlay_text"].text(font, overlay_text);
+    ui["show_overlays"] = overlay_text;
 }
 
 static void draw_sidebar_remainder(int x_offset, bool is_collapsed) {
@@ -196,6 +192,10 @@ void ui::sidebar_window::init() {
     });
 
     ui["show_messages"].onclick([] { window_message_list_show(); });
+
+    ui["show_overlays"]
+        .onclick([] { window_overlay_menu_show(); })
+        .onrclick([] { window_message_dialog_show(MESSAGE_DIALOG_OVERLAYS, -1, window_city_draw_all);; });
 }
 
 void ui::sidebar_window::ui_draw_foreground() {
@@ -340,10 +340,6 @@ static void slide_finished() {
     window_draw(1);
 }
 
-static void button_overlay(int param1, int param2) {
-    window_overlay_menu_show();
-}
-
 static void button_collapse_expand(int param1, int param2) {
     city_view_start_sidebar_toggle();
     auto draw_expanded_background = [] (int offset) { g_sidebar.x_offset = offset; };