summaryrefslogtreecommitdiffstats
path: root/src/frontend/mame/ui/info.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/info.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/info.cpp')
-rw-r--r--src/frontend/mame/ui/info.cpp51
1 files changed, 38 insertions, 13 deletions
diff --git a/src/frontend/mame/ui/info.cpp b/src/frontend/mame/ui/info.cpp
index 0dc8b8979e9..8c5d1b43d2b 100644
--- a/src/frontend/mame/ui/info.cpp
+++ b/src/frontend/mame/ui/info.cpp
@@ -481,7 +481,7 @@ std::string machine_info::get_screen_desc(screen_device &screen) const
menu_game_info - handle the game information menu
-------------------------------------------------*/
-menu_game_info::menu_game_info(mame_ui_manager &mui, render_container &container) : menu(mui, container)
+menu_game_info::menu_game_info(mame_ui_manager &mui, render_container &container) : menu_textbox(mui, container)
{
}
@@ -489,15 +489,26 @@ menu_game_info::~menu_game_info()
{
}
+void menu_game_info::populate_text(std::optional<text_layout> &layout, float &width, int &lines)
+{
+ if (!layout || (layout->width() != width))
+ {
+ rgb_t const color = ui().colors().text_color();
+ layout.emplace(ui().create_layout(container(), width));
+ layout->add_text(ui().machine_info().game_info_string(), color);
+ lines = layout->lines();
+ }
+ width = layout->actual_width();
+}
+
void menu_game_info::populate(float &customtop, float &custombottom)
{
- item_append(ui().machine_info().game_info_string(), FLAG_MULTILINE, nullptr);
}
-void menu_game_info::handle()
+void menu_game_info::handle(event const *ev)
{
- // process the menu
- process(0);
+ if (ev)
+ handle_key(ev->iptkey);
}
@@ -505,7 +516,7 @@ void menu_game_info::handle()
menu_warn_info - handle the emulation warnings menu
-------------------------------------------------*/
-menu_warn_info::menu_warn_info(mame_ui_manager &mui, render_container &container) : menu(mui, container)
+menu_warn_info::menu_warn_info(mame_ui_manager &mui, render_container &container) : menu_textbox(mui, container)
{
}
@@ -513,15 +524,26 @@ menu_warn_info::~menu_warn_info()
{
}
+void menu_warn_info::populate_text(std::optional<text_layout> &layout, float &width, int &lines)
+{
+ if (!layout || (layout->width() != width))
+ {
+ rgb_t const color = ui().colors().text_color();
+ layout.emplace(ui().create_layout(container(), width));
+ layout->add_text(ui().machine_info().warnings_string(), color);
+ lines = layout->lines();
+ }
+ width = layout->actual_width();
+}
+
void menu_warn_info::populate(float &customtop, float &custombottom)
{
- item_append(ui().machine_info().warnings_string(), FLAG_MULTILINE, nullptr);
}
-void menu_warn_info::handle()
+void menu_warn_info::handle(event const *ev)
{
- // process the menu
- process(0);
+ if (ev)
+ handle_key(ev->iptkey);
}
@@ -537,6 +559,11 @@ menu_image_info::~menu_image_info()
{
}
+void menu_image_info::menu_activated()
+{
+ reset(reset_options::REMEMBER_POSITION);
+}
+
void menu_image_info::populate(float &customtop, float &custombottom)
{
ui_system_info const &system(system_list::instance().systems()[driver_list::find(machine().system().name)]);
@@ -547,10 +574,8 @@ void menu_image_info::populate(float &customtop, float &custombottom)
image_info(&image);
}
-void menu_image_info::handle()
+void menu_image_info::handle(event const *ev)
{
- // process the menu
- process(0);
}