Fix text alignment

- Overlay button - Overlay menu items - Building menu items - Main menu items - Update chinese font spec Fixes #692
bvschaik · Jul 23, 2023 · 39f42cc · 39f42cc
1 parent 06efdc0
commit 39f42cc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/graphics/font.c b/src/graphics/font.c
@@ -403,7 +403,7 @@ static int image_y_offset_chinese(uint8_t c, int image_height, int line_height)
         if (c < 0x80) {
             return 0;
         } else {
-            return 1;
+            return 2;
         }
     }
     if (c < 0x80) {

diff --git a/src/window/build_menu.c b/src/window/build_menu.c
@@ -179,10 +179,10 @@ static void draw_menu_buttons(void)
         int type = building_menu_type(data.selected_submenu, item_index);
         if (is_all_button(type)) {
             text_draw_centered(translation_for(TR_BUILD_ALL_TEMPLES),
-                item_x_align, data.y_offset + MENU_Y_OFFSET + 3 + MENU_ITEM_HEIGHT * i,
+                item_x_align, data.y_offset + MENU_Y_OFFSET + 4 + MENU_ITEM_HEIGHT * i,
                 MENU_ITEM_WIDTH, FONT_NORMAL_GREEN, 0);
         } else {
-            lang_text_draw_centered(28, type, item_x_align, data.y_offset + MENU_Y_OFFSET + 3 + MENU_ITEM_HEIGHT * i,
+            lang_text_draw_centered(28, type, item_x_align, data.y_offset + MENU_Y_OFFSET + 4 + MENU_ITEM_HEIGHT * i,
                 MENU_ITEM_WIDTH, FONT_NORMAL_GREEN);
         }
         if (type == BUILDING_DRAGGABLE_RESERVOIR) {

diff --git a/src/window/main_menu.c b/src/window/main_menu.c
@@ -74,12 +74,12 @@ static void draw_foreground(void)
         large_label_draw(buttons[i].x, buttons[i].y, buttons[i].width / BLOCK_SIZE, focus_button_id == i + 1 ? 1 : 0);
     }
 
-    lang_text_draw_centered(30, 1, 192, 106, 256, FONT_NORMAL_GREEN);
-    lang_text_draw_centered(30, 2, 192, 146, 256, FONT_NORMAL_GREEN);
-    lang_text_draw_centered(30, 3, 192, 186, 256, FONT_NORMAL_GREEN);
-    lang_text_draw_centered(9, 8, 192, 226, 256, FONT_NORMAL_GREEN);
-    lang_text_draw_centered(2, 0, 192, 266, 256, FONT_NORMAL_GREEN);
-    lang_text_draw_centered(30, 5, 192, 306, 256, FONT_NORMAL_GREEN);
+    lang_text_draw_centered(30, 1, 192, 107, 256, FONT_NORMAL_GREEN);
+    lang_text_draw_centered(30, 2, 192, 147, 256, FONT_NORMAL_GREEN);
+    lang_text_draw_centered(30, 3, 192, 187, 256, FONT_NORMAL_GREEN);
+    lang_text_draw_centered(9, 8, 192, 227, 256, FONT_NORMAL_GREEN);
+    lang_text_draw_centered(2, 0, 192, 267, 256, FONT_NORMAL_GREEN);
+    lang_text_draw_centered(30, 5, 192, 307, 256, FONT_NORMAL_GREEN);
 
     graphics_reset_dialog();
 }

diff --git a/src/window/overlay_menu.c b/src/window/overlay_menu.c
@@ -95,15 +95,15 @@ static void draw_foreground(void)
     int x_offset = get_sidebar_x_offset();
     for (int i = 0; i < 8; i++) {
         label_draw(x_offset - 170, 74 + 24 * i, 10, data.menu_focus_button_id == i + 1 ? 1 : 2);
-        lang_text_draw_centered(14, MENU_ID_TO_OVERLAY[i], x_offset - 170, 77 + 24 * i, 160, FONT_NORMAL_GREEN);
+        lang_text_draw_centered(14, MENU_ID_TO_OVERLAY[i], x_offset - 170, 78 + 24 * i, 160, FONT_NORMAL_GREEN);
     }
     if (data.selected_submenu > 0) {
         image_draw(image_group(GROUP_BULLET), x_offset - 185, 80 + 24 * data.selected_menu);
         for (int i = 0; i < data.num_submenu_items; i++) {
             label_draw(x_offset - 348, 74 + 24 * (i + data.selected_menu),
                 10, data.submenu_focus_button_id == i + 1 ? 1 : 2);
             lang_text_draw_centered(14, SUBMENU_ID_TO_OVERLAY[data.selected_submenu][i],
-                x_offset - 348, 77 + 24 * (i + data.selected_menu), 160, FONT_NORMAL_GREEN);
+                x_offset - 348, 78 + 24 * (i + data.selected_menu), 160, FONT_NORMAL_GREEN);
         }
     }
 }