Add array in misc.hh to avoid double translation

xemu-project · Jun 20, 2022 · 8042e0a · abaire · Jun 20, 2022 · 8042e0a
1 parent a612e02
commit 8042e0a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/ui/xui/main-menu.cc b/ui/xui/main-menu.cc
@@ -823,7 +823,7 @@ void MainMenuAboutView::Draw()
 
     char *content = g_strdup_printf("%sScaling:      %dx\nResolution:   %dx%d\nDisplay Mode: %s", 
                                     sys_info_text, nv2a_get_surface_scale_factor(), 
-                                    width, height, GetDisplayMode());
+                                    width, height, display_modes[g_config.display.ui.fit]);
 
     static uint32_t time_start = 0;
     if (ImGui::IsWindowAppearing()) {

diff --git a/ui/xui/misc.hh b/ui/xui/misc.hh
@@ -28,6 +28,8 @@ extern "C" {
 #include <noc_file_dialog.h>
 }
 
+extern const char **display_modes;
+
 static inline
 bool IsNavInputPressed(ImGuiNavInput i) {
     ImGuiIO &io = ImGui::GetIO();

diff --git a/ui/xui/popup-menu.cc b/ui/xui/popup-menu.cc
@@ -252,23 +252,13 @@ bool PopupMenu::DrawItems(PopupMenuItemDelegate &nav)
 
 class DisplayModePopupMenu : public virtual PopupMenu {
 public:
-    const char *GetDisplayMode() 
-    {
-        const char *values[] = {
-            "Center", "Scale", "Scale (Widescreen 16:9)", "Scale (4:3)", "Stretch"
-        };
-        return values[g_config.display.ui.fit];
-    }
+
     bool DrawItems(PopupMenuItemDelegate &nav) override
     {
-        const char *values[] = {
-            "Center", "Scale", "Scale (Widescreen 16:9)", "Scale (4:3)", "Stretch"
-        };
-
         for (int i = 0; i < CONFIG_DISPLAY_UI_FIT__COUNT; i++) {
             bool selected = g_config.display.ui.fit == i;
             if (m_focus && selected) ImGui::SetKeyboardFocusHere();
-            if (PopupMenuCheck(values[i], "", selected))
+            if (PopupMenuCheck(display_modes[i], "", selected))
                 g_config.display.ui.fit = i;
         }