swars: Fixed few misses in menu components positioning

Author: mefistotelis

src/fecryo.c

@@ -1713,14 +1713,21 @@ void init_cryo_screen_boxes(void)
     space_h = 5;
     cryo_offer_cancel_button.X = cryo_cybmod_list_box.X + cryo_cybmod_list_box.Width - cryo_offer_cancel_button.Width - space_w;
     cryo_offer_cancel_button.Y = cryo_cybmod_list_box.Y + cryo_cybmod_list_box.Height - cryo_offer_cancel_button.Height - space_h;
+    // No need to update equip_cost_box - that is done in switch_shared_equip_screen_buttons_to_cybmod()
 }
 
 void switch_shared_equip_screen_buttons_to_cybmod(void)
 {
+    short space_w, space_h;
+
+    space_w = 5;
+    space_h = 5;
     set_heading_box_text(gui_strings[369]);
-    equip_cost_box.X = cryo_cybmod_list_box.X + 5;
-    equip_cost_box.Width = cryo_cybmod_list_box.Width - 10;
-    equip_cost_box.Y = 383;
+
+    equip_cost_box.X = cryo_cybmod_list_box.X + space_w;
+    equip_cost_box.Width = cryo_cybmod_list_box.Width - 2 * space_h;
+    equip_cost_box.Y = cryo_offer_cancel_button.Y - space_h - equip_cost_box.Height;
+
     equip_name_box.Text = cybmod_name_text;
     equip_all_agents_button.CallBackFn = ac_do_cryo_all_agents_set;
 

src/fedebrief.c

@@ -682,17 +682,7 @@ ubyte show_mission_people_stats(struct ScreenBox *box)
 
 void init_debrief_screen_boxes(void)
 {
-    ScrCoord scr_h, start_x, start_y;
-    short space_w, space_h, border;
-
-    // Border value represents how much the box background goes
-    // out of the box area.
-    border = 3;
-#ifdef EXPERIMENTAL_MENU_CENTER_H
-    scr_h = global_apps_bar_box.Y;
-#else
-    scr_h = 432;
-#endif
+    ScrCoord start_x, start_y;
 
     init_screen_box(&debrief_mission_box, 7u, 72u, 518u, 172, 6);
     debrief_mission_box.SpecialDrawFn = show_mission_stats;
@@ -702,22 +692,17 @@ void init_debrief_screen_boxes(void)
 
     // Reposition the components to current resolution
 
+    // For this screen, we will just align to other pre-positioned boxes;
+    // No need to compute positions from scratch
     start_x = heading_box.X;
-    // On the X axis, we're going for aligning below heading box, to both left and right
-    space_w = heading_box.Width - debrief_mission_box.Width - world_city_info_box.Width;
-
-    start_y = heading_box.Y + heading_box.Height;
-    // On the top, we're aligning to spilled border of previous box; same goes inside.
-    // But on the bottom, we're aligning to hard border, without spilling. To compensate
-    // for that, add pixels for such border to the space.
-    space_h = scr_h - start_y - world_city_info_box.Height + border;
+    start_y = world_city_info_box.Y;
 
     // Expect world_city_info_box to be already set
     debrief_mission_box.X = start_x;
-    debrief_mission_box.Y = world_city_info_box.Y;
+    debrief_mission_box.Y = start_y;
 
     debrief_people_box.X = start_x;
-    debrief_people_box.Y = world_city_info_box.Y + world_city_info_box.Height - debrief_people_box.Height;
+    debrief_people_box.Y = start_y + world_city_info_box.Height - debrief_people_box.Height;
 }
 
 void reset_debrief_screen_boxes_flags(void)

src/feequip.c

@@ -812,19 +812,6 @@ TbBool input_display_box_content_wep(struct ScreenTextBox *p_box)
     return false;
 }
 
-void switch_shared_equip_screen_buttons_to_equip(void)
-{
-    set_heading_box_text(gui_strings[370]);
-    refresh_equip_list = 1;
-    equip_cost_box.X = equip_offer_buy_button.X + equip_offer_buy_button.Width + 4;
-    equip_cost_box.Width = equip_list_box.Width - 2 - equip_offer_buy_button.Width - 14;
-    equip_cost_box.Y = 404;
-    equip_all_agents_button.CallBackFn = ac_do_equip_all_agents_set;
-
-    equip_display_box_redraw(&equip_display_box);
-    equip_name_box_redraw(&equip_name_box);
-}
-
 /** Determines if buy or sell should be available in the equip weapon offer.
  *
  * @return Gives 0 if button unavailable, 1 for buy, 2 for sell.
@@ -1339,10 +1326,26 @@ void init_equip_screen_boxes(void)
     space_h = 5;
     equip_offer_buy_button.X = equip_display_box.X + space_w;
     equip_offer_buy_button.Y = equip_display_box.Y + equip_display_box.Height - space_h - equip_offer_buy_button.Height;
+    // No need to update equip_cost_box - that is done in switch_shared_equip_screen_buttons_to_equip()
+}
+
+void switch_shared_equip_screen_buttons_to_equip(void)
+{
+    short space_w, space_h;
+
+    space_w = 5;
+    space_h = 5;
+    set_heading_box_text(gui_strings[370]);
+    refresh_equip_list = 1;
 
-    equip_cost_box.Width = equip_list_box.Width - equip_offer_buy_button.Width - 3 * space_w - 1;
-    equip_cost_box.X = equip_offer_buy_button.X + equip_offer_buy_button.Width - (space_w - 1) - equip_cost_box.Width;
+    equip_cost_box.Width = equip_display_box.Width - equip_offer_buy_button.Width - 3 * space_w - 1;
+    equip_cost_box.X = equip_display_box.X + equip_display_box.Width - (space_w - 1) - equip_cost_box.Width;
     equip_cost_box.Y = equip_display_box.Y + equip_display_box.Height - space_h - equip_cost_box.Height;
+
+    equip_all_agents_button.CallBackFn = ac_do_equip_all_agents_set;
+
+    equip_display_box_redraw(&equip_display_box);
+    equip_name_box_redraw(&equip_name_box);
 }
 
 void init_equip_screen_shapes(void)

src/fenet.c

@@ -541,7 +541,6 @@ void init_net_screen_boxes(void)
 {
     ScrCoord scr_w, scr_h, start_x, start_y;
     short space_w, space_h, border;
-    short content_boxes_height;
 
     // Border value represents how much the box background goes
     // out of the box area.

src/feoptions.c

@@ -694,6 +694,7 @@ void init_options_gfx_screen_boxes(void)
           options_gfx_buttons[i].Width) / 2;
         options_gfx_buttons[i].X = options_gfx_box.X +
           val + 9;
+        options_gfx_buttons[i].Y = options_gfx_buttons[12].Y + (i - 12) * 36;
     }
 }
 

src/festorage.c

@@ -108,10 +108,15 @@ void init_storage_screen_boxes(void)
     // There is one box only to position, so space goes into two parts - before and after.
     storage_slots_box.Y = start_y + space_h / 2;
 
-    storage_LOAD_button.X = storage_slots_box.X + 6;
-    storage_SAVE_button.X = storage_LOAD_button.X + storage_LOAD_button.Width + 4;
+    space_w = 5;
+    space_h = 5;
+    storage_LOAD_button.X = storage_slots_box.X + (space_w + 1);
+    storage_LOAD_button.Y = storage_slots_box.Y + storage_slots_box.Height - space_w - storage_LOAD_button.Height;
+    storage_SAVE_button.X = storage_LOAD_button.X + storage_LOAD_button.Width + (space_w - 1);
+    storage_SAVE_button.Y = storage_LOAD_button.Y;
     storage_NEW_MORTAL_button.X = storage_slots_box.X + storage_slots_box.Width -
-      storage_NEW_MORTAL_button.Width - 6;
+      storage_NEW_MORTAL_button.Width - (space_w + 1);
+    storage_NEW_MORTAL_button.Y = storage_LOAD_button.Y;
 }
 
 void reset_storage_screen_boxes_flags(void)

src/feworld.c

@@ -695,10 +695,15 @@ void init_world_screen_boxes(void)
     world_landmap_box.Y = world_city_info_box.Y;
     world_city_info_box.X = world_landmap_box.X + world_landmap_box.Width + space_w;
 
-    world_info_ACCEPT_button.X = world_city_info_box.X
-        + ((world_city_info_box.Width - world_info_ACCEPT_button.Width) >> 1);
+    space_h = 5;
     world_info_CANCEL_button.X = world_city_info_box.X
-        + ((world_city_info_box.Width - world_info_CANCEL_button.Width) >> 1);
+      + ((world_city_info_box.Width - world_info_CANCEL_button.Width) >> 1);
+    world_info_CANCEL_button.Y = world_city_info_box.Y + world_city_info_box.Height
+      - space_h - world_info_CANCEL_button.Height;
+    world_info_ACCEPT_button.X = world_city_info_box.X
+      + ((world_city_info_box.Width - world_info_ACCEPT_button.Width) >> 1);
+    world_info_ACCEPT_button.Y = world_info_CANCEL_button.Y
+      - space_h - world_info_ACCEPT_button.Height;
 }
 
 void reset_world_screen_boxes_flags(void)