diff options
| author | 2017-08-06 12:04:54 +1000 | |
|---|---|---|
| committer | 2017-08-06 12:04:54 +1000 | |
| commit | 0a6f98cd7d2490336aa99b80eeaba6eeb3c682be (patch) | |
| tree | eba7ca6352e472b14ac26d8d3fc230dd8c6e6159 /src/frontend | |
| parent | 952af08ca6e595bca87dbd902ce88d83304d935b (diff) | |
font_osx: handle fonts where space glyphs return a null bounding box (e.g. Hiragino family)
restore ability to localise info box headings
Diffstat (limited to 'src/frontend')
| -rw-r--r-- | src/frontend/mame/ui/selmenu.cpp | 19 | ||||
| -rw-r--r-- | src/frontend/mame/ui/selmenu.h | 2 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/frontend/mame/ui/selmenu.cpp b/src/frontend/mame/ui/selmenu.cpp index 291d0ea4ea6..2b35bead9df 100644 --- a/src/frontend/mame/ui/selmenu.cpp +++ b/src/frontend/mame/ui/selmenu.cpp @@ -119,7 +119,22 @@ bool menu_select_launch::reselect_last::s_reselect = false; std::mutex menu_select_launch::s_cache_guard; menu_select_launch::cache_ptr_map menu_select_launch::s_caches; - +// this needs to be here to allow the names from the data plugin to be localised +// it can't have static linkage, and it can't be private or clang will complain +// it also has to be kept in sync with the data plugin +char const *const menu_select_launch::s_info_titles[] = { + __("Command"), + __("Gameinit"), + __("High Scores"), + __("History"), + __("MAMEinfo"), + __("MARPScore"), + __("MESSinfo"), + __("Mamescore"), + __("Sysinfo") }; + + +// instantiate possible variants of select_bios so derived classes don't get link errors template bool menu_select_launch::select_bios(game_driver const &, bool); template bool menu_select_launch::select_bios(ui_software_info const &, bool); @@ -2386,7 +2401,7 @@ void menu_select_launch::infos_render(float origx1, float origy1, float origx2, else if (driver) { m_info_software = nullptr; - first = "General Info"; + first = __("General Info"); if (driver != m_info_driver || ui_globals::curdats_view != m_info_view) { diff --git a/src/frontend/mame/ui/selmenu.h b/src/frontend/mame/ui/selmenu.h index 0fe4feb641a..d9e4c33ba75 100644 --- a/src/frontend/mame/ui/selmenu.h +++ b/src/frontend/mame/ui/selmenu.h @@ -122,6 +122,8 @@ protected: int m_total_lines; int m_topline_datsview; // right box top line + static char const *const s_info_titles[]; + private: using bitmap_vector = std::vector<bitmap_argb32>; using texture_ptr_vector = std::vector<texture_ptr>; |
