From 4232c067b1b614534ce85bb9479c5fe2e9dff044 Mon Sep 17 00:00:00 2001 From: cracyc Date: Mon, 4 Sep 2017 12:47:24 -0500 Subject: selmenu: don't translate info box titles twice (nw) --- src/frontend/mame/ui/datmenu.cpp | 4 ++-- src/frontend/mame/ui/selmenu.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontend/mame/ui/datmenu.cpp b/src/frontend/mame/ui/datmenu.cpp index 420be864952..344cc59ee84 100644 --- a/src/frontend/mame/ui/datmenu.cpp +++ b/src/frontend/mame/ui/datmenu.cpp @@ -54,7 +54,7 @@ menu_dats_view::menu_dats_view(mame_ui_manager &mui, render_container &container { std::string version; mame_machine_manager::instance()->lua()->call_plugin("data_version", count, version); - m_items_list.emplace_back(_(item.c_str()), count, std::move(version)); + m_items_list.emplace_back(item.c_str(), count, std::move(version)); count++; } } @@ -86,7 +86,7 @@ menu_dats_view::menu_dats_view(mame_ui_manager &mui, render_container &container { std::string version; mame_machine_manager::instance()->lua()->call_plugin("data_version", count - 1, version); - m_items_list.emplace_back(_(item.c_str()), count, std::move(version)); + m_items_list.emplace_back(item.c_str(), count, std::move(version)); count++; } } diff --git a/src/frontend/mame/ui/selmenu.cpp b/src/frontend/mame/ui/selmenu.cpp index 3afa6c63a24..abe83714fa0 100644 --- a/src/frontend/mame/ui/selmenu.cpp +++ b/src/frontend/mame/ui/selmenu.cpp @@ -2555,16 +2555,16 @@ void menu_select_launch::infos_render(float origx1, float origy1, float origx2, float ud_arrow_width = line_height * machine().render().ui_aspect(); float oy1 = origy1 + line_height; - char const *const snaptext(m_info_view ? _(m_items_list[m_info_view - 1].c_str()) : _(first)); + char const *const snaptext(m_info_view ? m_items_list[m_info_view - 1].c_str() : _(first)); // get width of widest title float title_size(0.0f); for (std::size_t x = 0; total > x; ++x) { - char const *const name(x ? m_items_list[x - 1].c_str() : first); + char const *const name(x ? m_items_list[x - 1].c_str() : _(first)); float txt_length(0.0f); ui().draw_text_full( - container(), _(name), + container(), name, origx1, origy1, origx2 - origx1, ui::text_layout::CENTER, ui::text_layout::NEVER, mame_ui_manager::NONE, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, -- cgit v1.2.3