From 62af27d4d950e760130a7d9aa364745dc04ce9da Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 12 Apr 2021 14:43:33 +0200 Subject: ui: add separator before 'return to previous menu' --- src/frontend/mame/ui/analogipt.cpp | 2 ++ src/frontend/mame/ui/inputmap.cpp | 3 +++ src/frontend/mame/ui/mainmenu.cpp | 2 +- src/frontend/mame/ui/miscmenu.cpp | 10 +++++++--- src/frontend/mame/ui/tapectrl.cpp | 2 ++ src/frontend/mame/ui/videoopt.cpp | 3 +++ 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/frontend/mame/ui/analogipt.cpp b/src/frontend/mame/ui/analogipt.cpp index 83b7b48f09d..d1df77c5647 100644 --- a/src/frontend/mame/ui/analogipt.cpp +++ b/src/frontend/mame/ui/analogipt.cpp @@ -251,6 +251,8 @@ void menu_analog::populate(float &customtop, float &custombottom) item_append(std::move(text), std::move(subtext), flags, &data); } + item_append(menu_item_type::SEPARATOR); + // space for live display custombottom = (ui().get_line_height() * m_visible_fields) + (ui().box_tb_border() * 3.0f); } diff --git a/src/frontend/mame/ui/inputmap.cpp b/src/frontend/mame/ui/inputmap.cpp index a4638e76536..8ac4b5943c8 100644 --- a/src/frontend/mame/ui/inputmap.cpp +++ b/src/frontend/mame/ui/inputmap.cpp @@ -42,6 +42,7 @@ void menu_input_groups::populate(float &customtop, float &custombottom) item_append(s, 0, (void *)uintptr_t(IPG_PLAYER1 + player + 1)); } item_append(_("Other Controls"), 0, (void *)uintptr_t(IPG_OTHER + 1)); + item_append(menu_item_type::SEPARATOR); } void menu_input_groups::handle() @@ -496,6 +497,8 @@ void menu_input::populate_sorted(float &customtop, float &custombottom) item_append(std::move(text), std::move(subtext), flags, &item); } + item_append(menu_item_type::SEPARATOR); + // pre-format messages assignprompt = util::string_format(_("Press %1$s to set\n"), machine().input().seq_name(machine().ioport().type_seq(IPT_UI_SELECT))); appendprompt = util::string_format(_("Press %1$s to append\n"), machine().input().seq_name(machine().ioport().type_seq(IPT_UI_SELECT))); diff --git a/src/frontend/mame/ui/mainmenu.cpp b/src/frontend/mame/ui/mainmenu.cpp index 15c1f6207d5..32c88a24ca0 100644 --- a/src/frontend/mame/ui/mainmenu.cpp +++ b/src/frontend/mame/ui/mainmenu.cpp @@ -122,7 +122,7 @@ void menu_main::populate(float &customtop, float &custombottom) if (machine().options().cheat()) item_append(_("Cheat"), 0, (void *)CHEAT); - if (machine().options().plugins()) + if (machine().options().plugins() && !mame_machine_manager::instance()->lua()->get_menu().empty()) item_append(_("Plugin Options"), 0, (void *)PLUGINS); if (mame_machine_manager::instance()->lua()->call_plugin_check("data_list", "", true)) diff --git a/src/frontend/mame/ui/miscmenu.cpp b/src/frontend/mame/ui/miscmenu.cpp index a12647ec684..68ffadb0699 100644 --- a/src/frontend/mame/ui/miscmenu.cpp +++ b/src/frontend/mame/ui/miscmenu.cpp @@ -147,6 +147,8 @@ void menu_network_devices::populate(float &customtop, float &custombottom) item_append(network.device().tag(), (title) ? title : "------", FLAG_LEFT_ARROW | FLAG_RIGHT_ARROW, (void *)&network); } + + item_append(menu_item_type::SEPARATOR); } /*------------------------------------------------- @@ -506,6 +508,8 @@ void menu_crosshair::populate(float &customtop, float &custombottom) break; } } + + item_append(menu_item_type::SEPARATOR); } menu_crosshair::~menu_crosshair() @@ -795,8 +799,8 @@ void menu_machine_configure::populate(float &customtop, float &custombottom) item_append(_("Remove From Favorites"), 0, (void *)DELFAV); item_append(menu_item_type::SEPARATOR); - item_append(_("Save machine configuration"), 0, (void *)(uintptr_t)SAVE); - item_append(menu_item_type::SEPARATOR); + item_append(_("Save Machine Configuration"), 0, (void *)(uintptr_t)SAVE); + customtop = 2.0f * ui().get_line_height() + 3.0f * ui().box_tb_border(); } @@ -806,7 +810,7 @@ void menu_machine_configure::populate(float &customtop, float &custombottom) void menu_machine_configure::custom_render(void *selectedref, float top, float bottom, float origx1, float origy1, float origx2, float origy2) { - char const *const text[] = { _("Configure machine:"), m_drv.type.fullname() }; + char const *const text[] = { _("Configure Machine:"), m_drv.type.fullname() }; draw_text_box( std::begin(text), std::end(text), origx1, origx2, origy1 - top, origy1 - ui().box_tb_border(), diff --git a/src/frontend/mame/ui/tapectrl.cpp b/src/frontend/mame/ui/tapectrl.cpp index 720622f0e81..7881ac420db 100644 --- a/src/frontend/mame/ui/tapectrl.cpp +++ b/src/frontend/mame/ui/tapectrl.cpp @@ -106,6 +106,8 @@ void menu_tape_control::populate(float &customtop, float &custombottom) // fast forward item_append(_("Fast Forward"), 0, TAPECMD_FAST_FORWARD); } + + item_append(menu_item_type::SEPARATOR); } } diff --git a/src/frontend/mame/ui/videoopt.cpp b/src/frontend/mame/ui/videoopt.cpp index 861bc9ce94e..8d5ccbca88c 100644 --- a/src/frontend/mame/ui/videoopt.cpp +++ b/src/frontend/mame/ui/videoopt.cpp @@ -59,6 +59,7 @@ void menu_video_targets::populate(float &customtop, float &custombottom) // add option for snapshot target item_append("Snapshot", 0, &machine().video().snapshot_target()); + item_append(menu_item_type::SEPARATOR); } /*------------------------------------------------- @@ -212,6 +213,8 @@ void menu_video_options::populate(float &customtop, float &custombottom) // keep aspect item_append_on_off(_("Maintain Aspect Ratio"), m_target.keepaspect(), 0, reinterpret_cast(ITEM_KEEPASPECT)); } + + item_append(menu_item_type::SEPARATOR); } -- cgit v1.2.3