From ac9262345434f440b61649a24538806e91f21e0f Mon Sep 17 00:00:00 2001
From: Mikolaj Wielgus <wielgusmikolaj@gmail.com>
Date: Mon, 14 Oct 2024 23:24:13 +0200
Subject: [PATCH] refactor(egui): move Properties menu to its own method

---
 src/bin/topola-egui/menu_bar.rs | 58 +++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/bin/topola-egui/menu_bar.rs b/src/bin/topola-egui/menu_bar.rs
index 1977f87..efce0f7 100644
--- a/src/bin/topola-egui/menu_bar.rs
+++ b/src/bin/topola-egui/menu_bar.rs
@@ -1,5 +1,5 @@
 use icu::{
-    experimental::displaynames::LocaleDisplayNamesFormatter,
+    experimental::displaynames::{DisplayNamesOptions, Fallback, LocaleDisplayNamesFormatter},
     locid::{locale, LanguageIdentifier, Locale},
 };
 use std::{borrow::Cow, ops::ControlFlow, path::Path, sync::mpsc::Sender};
@@ -169,29 +169,7 @@ impl MenuBar {
                         });
                     });
 
-                    ui.menu_button(tr.text("tr-menu-properties"), |ui| {
-                        ui.menu_button(tr.text("tr-menu-properties-set-language"), |ui| {
-                            for langid in Translator::locales() {
-                                if let Ok(locale) =
-                                    Locale::try_from_bytes(langid.to_string().as_bytes())
-                                {
-                                    if let Ok(formatter) = LocaleDisplayNamesFormatter::try_new(
-                                        &locale.clone().into(),
-                                        Default::default(),
-                                    ) {
-                                        ui.radio_value(
-                                            tr.langid_mut(),
-                                            langid.clone(),
-                                            formatter.of(&locale),
-                                        );
-                                        continue;
-                                    }
-                                }
-
-                                ui.radio_value(tr.langid_mut(), langid.clone(), langid.to_string());
-                            }
-                        });
-                    });
+                    self.update_properties_menu(ctx, ui, tr);
 
                     ui.menu_button(tr.text("tr-menu-help"), |ui| {
                         actions.help.online_documentation.hyperlink(
@@ -386,4 +364,36 @@ impl MenuBar {
             ui.add(egui::widgets::Slider::new(&mut self.frame_timestep, 0.0..=3.0).suffix(" s"));
         });
     }
+
+    pub fn update_properties_menu(
+        &mut self,
+        ctx: &egui::Context,
+        ui: &mut egui::Ui,
+        tr: &mut Translator,
+    ) {
+        ui.menu_button(tr.text("tr-menu-properties"), |ui| {
+            ui.menu_button(tr.text("tr-menu-properties-set-language"), |ui| {
+                let mut display_names_options: DisplayNamesOptions = Default::default();
+                display_names_options.fallback = Fallback::None;
+
+                for langid in Translator::locales() {
+                    if let Ok(locale) = Locale::try_from_bytes(langid.to_string().as_bytes()) {
+                        if let Ok(formatter) = LocaleDisplayNamesFormatter::try_new(
+                            &locale.clone().into(),
+                            display_names_options,
+                        ) {
+                            // NOTE: I don't know how to reliably detect if there's no display name
+                            // in the current locale to fall back to the English display name.
+                            // NOTE: At the time of writing, `Fallback::None` handling hasn't been
+                            // implemented in the ICU library, despite this enum variant existing.
+                            ui.radio_value(tr.langid_mut(), langid.clone(), formatter.of(&locale));
+                            continue;
+                        }
+                    }
+
+                    ui.radio_value(tr.langid_mut(), langid.clone(), langid.to_string());
+                }
+            });
+        });
+    }
 }