Space the campaign pause rows like the profile settings list.

Adding Settings centred the last row onto the B and A prompts. The rows now use that list's pitch, and the box grows so the prompts stay under the last row.

port/assets/menus/ce/bitmaps.xml

@@ -341,14 +341,17 @@
 	<bitmap name="pause/pausebox_left">
 		<frame png="ce/port/pause/pausebox_left__0.png" width="16" height="256"/>
 		<frame png="ce/port/pause/pausebox_left__1.png" width="16" height="256"/>
+		<frame png="ce/port/pause/pausebox_left__2.png" width="16" height="256"/>
 	</bitmap>
 	<bitmap name="pause/pausebox_center">
 		<frame png="ce/port/pause/pausebox_center__0.png" width="4" height="256"/>
 		<frame png="ce/port/pause/pausebox_center__1.png" width="4" height="256"/>
+		<frame png="ce/port/pause/pausebox_center__2.png" width="4" height="256"/>
 	</bitmap>
 	<bitmap name="pause/pausebox_right">
 		<frame png="ce/port/pause/pausebox_right__0.png" width="16" height="256"/>
 		<frame png="ce/port/pause/pausebox_right__1.png" width="16" height="256"/>
+		<frame png="ce/port/pause/pausebox_right__2.png" width="16" height="256"/>
 	</bitmap>
 	<bitmap name="voice/speaker">
 		<frame png="ce/port/voice/speaker__0.png" width="24" height="24"/>

port/assets/menus/menus.json

@@ -65,10 +65,13 @@
   "ce/port/main_menu/multiplayer_type_select/server_settings/voice_options/header_voice_options.png",
   "ce/port/pause/pausebox_center__0.png",
   "ce/port/pause/pausebox_center__1.png",
+  "ce/port/pause/pausebox_center__2.png",
   "ce/port/pause/pausebox_left__0.png",
   "ce/port/pause/pausebox_left__1.png",
+  "ce/port/pause/pausebox_left__2.png",
   "ce/port/pause/pausebox_right__0.png",
   "ce/port/pause/pausebox_right__1.png",
+  "ce/port/pause/pausebox_right__2.png",
   "ce/port/voice/speaker__0.png",
   "ce/port/voice/speaker__1.png",
   "ce/shell/bitmaps/alert_bkd__0.png",

port/assets/menus/port_svg/pause/pausebox_center__2.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="4" height="256" viewBox="0 0 4 256">
+  <rect x="0" y="2" width="4" height="203" fill="#0a2649" fill-opacity="0.75"/>
+  <rect x="0" y="0" width="4" height="2" fill="#2896ff"/>
+  <rect x="0" y="205" width="4" height="2" fill="#2896ff"/>
+</svg>

port/assets/menus/port_svg/pause/pausebox_left__2.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="256" viewBox="0 0 16 256">
+  <path d="M9.5,1 H17 V206 H9.5 A8.5,8.5 0 0 1 1,197.5 V9.5 A8.5,8.5 0 0 1 9.5,1 Z" fill="#0a2649" fill-opacity="0.75" fill-rule="evenodd"/>
+  <path d="M17,1 H9.5 A8.5,8.5 0 0 0 1,9.5 V197.5 A8.5,8.5 0 0 0 9.5,206 H17" fill="none" stroke="#2896ff" stroke-width="2"/>
+</svg>

port/assets/menus/port_svg/pause/pausebox_right__2.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="256" viewBox="0 0 16 256">
+  <g transform="matrix(-1 0 0 1 16 0)">
+    <path d="M9.5,1 H17 V206 H9.5 A8.5,8.5 0 0 1 1,197.5 V9.5 A8.5,8.5 0 0 1 9.5,1 Z" fill="#0a2649" fill-opacity="0.75" fill-rule="evenodd"/>
+    <path d="M17,1 H9.5 A8.5,8.5 0 0 0 1,9.5 V197.5 A8.5,8.5 0 0 0 9.5,206 H17" fill="none" stroke="#2896ff" stroke-width="2"/>
+  </g>
+</svg>

port/linux/game/menu_tags.c

@@ -1749,10 +1749,12 @@ static void pause_patch(struct cache_file_tag_instance *instances)
 /* ---------- the single-player campaign's pause menu
 
 Its list gets the same SETTINGS (pause_list_patch) before REVERT TO SAVED, a
-copy of it; a list with room centres its rows (Halo PC's), and one that has
-none keeps its size, its rows closer, as its box beside the mission
-objectives' does. Settings there has only the items that work in a game
-(pause_settings_patch), and Gamepads' OK saves the profile itself. */
+copy of it. The rows use the profile settings list's pitch, so a highlight
+sits clear of the next label the way CONTROLS SETUP and the rest do. The
+prompts (B and A) stay that same gap under the last row, and the box beside
+the mission objectives grows with them. Settings there has only the items
+that work in a game (pause_settings_patch), and Gamepads' OK saves the
+profile itself. */
 
 #define PAUSE_SETTINGS_LIST "main_menu/settings_select/player_setup/player_profile_edit/profile_edit_select_list"
 #define PAUSE_SETTINGS_GAMEPADS_OK "main_menu/settings_select/player_setup/player_profile_edit/gamepad_setup/button_ok"
@@ -1767,15 +1769,119 @@ static char const *const pause_settings_hidden_items[] =
 	"main_menu/settings_select/player_setup/player_profile_edit/about_item",
 };
 
-/* the list's rows spaced evenly over the span its rows had (a list that grew
-for SETTINGS, back to its own size) */
-static void pause_list_fit(struct ui_widget_definition *list, short span)
-{
-	struct ui_widget_child_reference *children = list->child_widgets.address;
-	long count = list->child_widgets.count, child;
+/* the profile settings list's row pitch (CONTROLS SETUP, GAMEPADS, and the
+rest: 33 apart). The third pause box frame is the stock 159 grown by the
+48 that five rows at this pitch add (tools/port_settings.py) */
+#define PAUSE_CAMPAIGN_ROW_PITCH 33
+#define PAUSE_CAMPAIGN_BOX_FRAME 2
+#define PAUSE_CAMPAIGN_BOX_HEIGHT 207
 
-	for (child = 1; child < count; child++)
-		children[child].vertical_offset = (short)(children[0].vertical_offset + child * span / (count - 1));
+/* the port box piece for one of the map's pause box pieces, else NULL */
+static char const *pause_campaign_box_bitmap(long tag_index)
+{
+	if (tag_name_ends(tag_index, "\\pausebox2_left_center") || tag_name_ends(tag_index, "\\pausebox_right_center") ||
+		tag_name_ends(tag_index, "\\pausebox_center"))
+	{
+		return "pause/pausebox_center";
+	}
+	if (tag_name_ends(tag_index, "\\pausebox2_left") || tag_name_ends(tag_index, "\\pausebox_left"))
+		return "pause/pausebox_left";
+	if (tag_name_ends(tag_index, "\\pausebox2_right") || tag_name_ends(tag_index, "\\pausebox_right"))
+		return "pause/pausebox_right";
+	return NULL;
+}
+
+/* the screen offset of the prompts under the list (B and A), else NONE */
+static short pause_campaign_prompts(struct ui_widget_definition const *screen)
+{
+	struct ui_widget_child_reference const *children = screen->child_widgets.address;
+	long child;
+
+	for (child = 0; child < screen->child_widgets.count; child++)
+	{
+		if (tag_name_ends(children[child].widget_tag.index, "\\button_key_sm") ||
+			tag_name_ends(children[child].widget_tag.index, "\\button_key"))
+		{
+			return children[child].vertical_offset;
+		}
+	}
+	return NONE;
+}
+
+/* the prompts move down with the last row */
+static void pause_campaign_shift_prompts(struct ui_widget_definition *widget, short shift)
+{
+	struct ui_widget_child_reference *children = widget->child_widgets.address;
+	long child;
+
+	for (child = 0; child < widget->child_widgets.count; child++)
+	{
+		if (children[child].widget_tag.index == NONE)
+			continue;
+		if (tag_name_ends(children[child].widget_tag.index, "\\button_key_sm") ||
+			tag_name_ends(children[child].widget_tag.index, "\\button_key"))
+		{
+			children[child].vertical_offset = (short)(children[child].vertical_offset + shift);
+		}
+		else if (!pause_campaign_box_bitmap(children[child].widget_tag.index))
+		{
+			pause_campaign_shift_prompts(tag_get(UI_WIDGET_DEFINITION_TAG, children[child].widget_tag.index), shift);
+		}
+	}
+}
+
+/* the box (the menu's, and the mission objectives' beside it) grows by the
+same amount, using the frame drawn for that height */
+static void pause_campaign_grow_box(struct ui_widget_definition *widget, short shift)
+{
+	struct ui_widget_child_reference *children;
+	long child;
+	boolean piece_here = FALSE;
+
+	if (!widget || shift <= 0 || widget->child_widgets.count <= 0)
+		return;
+	children = widget->child_widgets.address;
+	for (child = 0; child < widget->child_widgets.count; child++)
+	{
+		struct ui_widget_definition *child_widget;
+		char const *piece_bitmap;
+
+		if (children[child].widget_tag.index == NONE)
+			continue;
+		child_widget = tag_get(UI_WIDGET_DEFINITION_TAG, children[child].widget_tag.index);
+		piece_bitmap = pause_campaign_box_bitmap(children[child].widget_tag.index);
+		if (!piece_bitmap)
+		{
+			pause_campaign_grow_box(child_widget, shift);
+			continue;
+		}
+		piece_here = TRUE;
+		{
+			/* (bitmap_name is the lookup, not piece_bitmap: find calls it) */
+			long bitmap = find(piece_bitmap, build.menus->bitmap_count, bitmap_name);
+			short height = (short)(child_widget->bounds.y1 - child_widget->bounds.y0);
+
+			if (bitmap != NONE && (short)(height + shift) == PAUSE_CAMPAIGN_BOX_HEIGHT)
+			{
+				struct bitmap_group *group = bitmap_group_get(build.bitmap_tags[bitmap]);
+				struct bitmap_group_sequence *sequence = group ? group->sequences.address : NULL;
+
+				if (sequence && PAUSE_CAMPAIGN_BOX_FRAME < group->bitmaps.count)
+				{
+					sequence->first_bitmap_index = PAUSE_CAMPAIGN_BOX_FRAME;
+					sequence->bitmap_count = 1;
+					reference_set(&child_widget->background_bitmap, BITMAP_GROUP_TAG, build.bitmap_tags[bitmap]);
+					child_widget->bounds.y1 = (short)(child_widget->bounds.y0 + PAUSE_CAMPAIGN_BOX_HEIGHT);
+				}
+			}
+			else
+			{
+				child_widget->bounds.y1 = (short)(child_widget->bounds.y1 + shift);
+			}
+		}
+	}
+	if (piece_here)
+		widget->bounds.y1 = (short)(widget->bounds.y1 + shift);
 }
 
 static boolean pause_settings_item_hidden(long tag_index)
@@ -1861,7 +1967,7 @@ static void pause_campaign_patch(struct cache_file_tag_instance *instances)
 	{
 		struct ui_widget_definition *list;
 		struct ui_widget_child_reference const *rows;
-		short span, grow, bottom;
+		short span, top, grow, bottom;
 		long revert;
 
 		if (children[child].widget_tag.index == NONE)
@@ -1880,13 +1986,40 @@ static void pause_campaign_patch(struct cache_file_tag_instance *instances)
 		if (revert == list->child_widgets.count)
 			return;
 		span = (short)(rows[list->child_widgets.count - 1].vertical_offset - rows[0].vertical_offset);
+		top = rows[0].vertical_offset;
 		bottom = list->bounds.y1;
 		if (pause_list_patch(instances, list, revert, FALSE, &grow))
 		{
-			if (grow)
+			struct ui_widget_child_reference *placed = list->child_widgets.address;
+			struct ui_widget_definition const *button =
+				tag_get(UI_WIDGET_DEFINITION_TAG, placed[0].widget_tag.index);
+			short height = (short)(button->bounds.y1 - button->bounds.y0);
+			short prompts = pause_campaign_prompts(definition);
+			short count = (short)list->child_widgets.count;
+			short row, new_last, need = 0;
+
+			for (row = 0; row < count; row++)
+				placed[row].vertical_offset = (short)(top + row * PAUSE_CAMPAIGN_ROW_PITCH);
+			new_last = placed[count - 1].vertical_offset;
+			list->bounds.y1 = bottom;
+			if (list->bounds.y1 < (short)(new_last + height))
+				list->bounds.y1 = (short)(new_last + height);
+			/* keep the gap the last row had above the prompts, and grow the
+			box by the same amount */
+			if (prompts != NONE)
 			{
-				pause_list_fit(list, span);
-				list->bounds.y1 = bottom;
+				short old_bottom = (short)(children[child].vertical_offset + top + span + height);
+				short new_bottom = (short)(children[child].vertical_offset + new_last + height);
+				short clearance = (short)(prompts - old_bottom);
+
+				if (clearance < 0)
+					clearance = 0;
+				need = (short)(new_bottom + clearance - prompts);
+			}
+			if (need > 0)
+			{
+				pause_campaign_shift_prompts(definition, need);
+				pause_campaign_grow_box(definition, need);
 			}
 			pause_settings_patch();
 			platform_log("menus: the pause menu has SETTINGS");

tools/ce_menus.py

@@ -623,9 +623,10 @@ def main() -> None:
     lines += [art.title(name, text) for name, text in sorted(port_settings.TITLES.items())]
     # (the in-game pause menu's taller box: menu_tags.c's pause_patch)
     for piece in ("left", "center", "right"):
+        heights = [port_settings.pause_box_height(buttons) for buttons in port_settings.PAUSE_BOX_BUTTONS]
+        heights += list(port_settings.PAUSE_BOX_EXTRA_HEIGHTS)
         lines.append(art.port_picture(f"pause/pausebox_{piece}", [
-            (port_settings.pause_box_svg(piece, port_settings.pause_box_height(buttons)), 4 if piece == "center" else 16,
-             256) for buttons in port_settings.PAUSE_BOX_BUTTONS]))
+            (port_settings.pause_box_svg(piece, height), 4 if piece == "center" else 16, 256) for height in heights]))
     # (voice chat's speaker, of a player who talks and of one muted: Lucide's
     # icons, port/assets/icons/lucide, white for network_voice.c to tint)
     lines.append(art.port_picture("voice/speaker", [

tools/port_settings.py

@@ -695,6 +695,10 @@ def title_backdrop(width: float) -> str:
 # hold each number of buttons, one frame each (the Xbox's 2-button box is
 # 159 units high, and each button 35 more)
 PAUSE_BOX_BUTTONS = [3, 4]
+# the campaign pause box, tall enough for five rows at the profile settings
+# list's pitch (33) with the prompts still under the last row: the stock box
+# is 159, and those rows need 48 more
+PAUSE_BOX_EXTRA_HEIGHTS = [207]
 
 
 def pause_box_height(buttons: int) -> int: