summaryrefslogtreecommitdiffstats
path: root/src/frontend/mame/ui/confswitch.cpp
diff options
context:
space:
mode:
author Vas Crabb <cuavas@users.noreply.github.com>2021-10-31 12:31:16 +1100
committer GitHub <noreply@github.com>2021-10-31 12:31:16 +1100
commitd64ea5331b2312f81df464fb22dcef0191216d86 (patch)
treea3f3784371da401e6a675e5b6b9734b88281a08d /src/frontend/mame/ui/confswitch.cpp
parentcfffc54b61cabc5ef9533396bf87324eb5eeb63e (diff)
-frontend: Refactored menu event handling and fixed a number of issues. (#8777)
* Moved common code for drawing about box, info viewer, and other text box menus to a base class; removed the last of the info viewer logic and the multi-line item hack from the base menu class. * Added previous/next group navigation for general inputs and plugin input selection menus. * Moved message catalog logic to lib/util, allowing osd and emu to use localised messages. * Made the base menu class use the UI manager’s feature for holding session state rather than a static map and mutex. * Improved menu event handling model, and fixed many issues, particularly with menus behaving badly when hidden/shown. * Added better support for menus that don’t participate in the usual menu stack, like the menuless sliders and the save/load state menus. * Made a number of menus refresh state when being shown after being hidden (fixes MT08121 among other issues). * Fixed indication of mounted slot option in the slot option details menu. * Improved appearance of background menus when emulation isn't running - draw all menus in the stack, and darken the background menus to make the edges of the active menu clearer. * Fixed locale issues in -listxml. -debugger: Made GUI debuggers more uniform. * Added new memory view features to Win32 debugger. * Fixed spelling of hexadecimal in Cocoa debugger and added decimal address option. * Fixed duplicate keyboard shortcut in Cocoa debugger (Shift-Cmd-D was both new device window and 64-bit float format). * Made keyboard shortcuts slightly more consistent across debuggers. -plugins: Moved input selection menu and sequence polling code to a common library. Fixed the issue that prevented keyboard inputs being mapped with -steadykey on. -docs: Started adding some documentation for MAME's internal UI, and updated the list of example front-ends. -Regenerated message catalog sources. For translators, the new strings are mostly: * The names of the inputs provided by the OS-dependent layer for things like fullscreen and video features. These show up in the user interface inputs menu. * The names for automatically generated views. These show up in the video options menu - test with a system with a lot of screens to see more variants. * The input macro plugin UI. * A few format strings for analog input assignments. * A few strings for the about box header.
Diffstat (limited to 'src/frontend/mame/ui/confswitch.cpp')
-rw-r--r--src/frontend/mame/ui/confswitch.cpp24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/frontend/mame/ui/confswitch.cpp b/src/frontend/mame/ui/confswitch.cpp
index be1346171d3..3aa10cd9133 100644
--- a/src/frontend/mame/ui/confswitch.cpp
+++ b/src/frontend/mame/ui/confswitch.cpp
@@ -82,6 +82,13 @@ menu_confswitch::~menu_confswitch()
}
+void menu_confswitch::menu_activated()
+{
+ // switches can have input assignments, and scripts are a thing
+ reset(reset_options::REMEMBER_REF);
+}
+
+
void menu_confswitch::populate(float &customtop, float &custombottom)
{
// locate relevant fields if necessary
@@ -162,31 +169,28 @@ void menu_confswitch::populate(float &customtop, float &custombottom)
}
item_append(menu_item_type::SEPARATOR);
- item_append(_("Reset"), 0, (void *)1);
+ item_append(_("Reset Machine"), 0, (void *)1);
}
-void menu_confswitch::handle()
+void menu_confswitch::handle(event const *ev)
{
- // process the menu
- event const *const menu_event(process(0));
-
// handle events
- if (menu_event && menu_event->itemref)
+ if (ev && ev->itemref)
{
- if (uintptr_t(menu_event->itemref) == 1U)
+ if (uintptr_t(ev->itemref) == 1U)
{
// reset
- if (menu_event->iptkey == IPT_UI_SELECT)
+ if (ev->iptkey == IPT_UI_SELECT)
machine().schedule_hard_reset();
}
else
{
// actual settings
- ioport_field &field(*reinterpret_cast<ioport_field *>(menu_event->itemref));
+ ioport_field &field(*reinterpret_cast<ioport_field *>(ev->itemref));
bool changed(false);
- switch (menu_event->iptkey)
+ switch (ev->iptkey)
{
// if selected, reset to default value
case IPT_UI_SELECT: