diff options
Diffstat (limited to 'src/emu/ui/selsoft.cpp')
-rw-r--r-- | src/emu/ui/selsoft.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/emu/ui/selsoft.cpp b/src/emu/ui/selsoft.cpp index 1c85ccf5fde..8f919c9a01e 100644 --- a/src/emu/ui/selsoft.cpp +++ b/src/emu/ui/selsoft.cpp @@ -171,7 +171,10 @@ void ui_menu_select_software::handle() { // reset the error on any future m_event if (ui_error) + { ui_error = false; + machine().ui_input().reset(); + } // handle selections else if (m_event->iptkey == IPT_UI_SELECT) @@ -375,7 +378,7 @@ void ui_menu_select_software::handle() // if we're in an error state, overlay an error message if (ui_error) machine().ui().draw_text_box(container, _("The selected software is missing one or more required files. " - "Please select a different software.\n\nPress any key (except ESC) to continue."), + "Please select a different software.\n\nPress any key to continue."), JUSTIFY_CENTER, 0.5f, 0.5f, UI_RED_COLOR); // handle filters selection from key shortcuts @@ -428,7 +431,6 @@ void ui_menu_select_software::populate() machine_config config(*m_driver, machine().options()); image_interface_iterator iter(config.root_device()); - for (device_image_interface *image = iter.first(); image != nullptr; image = iter.next()) if (image->filename() == nullptr && image->must_be_loaded()) { @@ -1413,13 +1415,13 @@ float ui_menu_select_software::draw_left_panel(float x1, float y1, float x2, flo line_height = l_height * text_size; } - float text_sign = mui.get_string_width_ex("_# ", text_size); + float text_sign = mui.get_string_width("_# ", text_size); for (int x = 0; x < text_lenght; ++x) { float total_width; // compute width of left hand side - total_width = mui.get_string_width_ex(text[x], text_size); + total_width = mui.get_string_width(text[x], text_size); total_width += text_sign; // track the maximum @@ -1428,7 +1430,6 @@ float ui_menu_select_software::draw_left_panel(float x1, float y1, float x2, flo } x2 = x1 + left_width + 2.0f * UI_BOX_LR_BORDER; - //machine().ui().draw_outlined_box(container, x1, y1, x2, y2, rgb_t(0xEF, 0x12, 0x47, 0x7B)); mui.draw_outlined_box(container, x1, y1, x2, y2, UI_BACKGROUND_COLOR); // take off the borders @@ -1509,7 +1510,6 @@ float ui_menu_select_software::draw_left_panel(float x1, float y1, float x2, flo float ar_x1 = ar_x0 + lr_arrow_width; float ar_y1 = 0.5f * (y2 + y1) + 0.9f * space; - //machine().ui().draw_outlined_box(container, x1, y1, x2, y2, UI_BACKGROUND_COLOR); mui.draw_outlined_box(container, x1, y1, x2, y2, rgb_t(0xEF, 0x12, 0x47, 0x7B)); if (mouse_hit && x1 <= mouse_x && x2 > mouse_x && y1 <= mouse_y && y2 > mouse_y) @@ -1533,7 +1533,6 @@ float ui_menu_select_software::draw_left_panel(float x1, float y1, float x2, flo float ar_x1 = ar_x0 + lr_arrow_width; float ar_y1 = 0.5f * (y2 + y1) + 0.9f * space; - //machine().ui().draw_outlined_box(container, x1, y1, x2, y2, UI_BACKGROUND_COLOR); mui.draw_outlined_box(container, x1, y1, x2, y2, rgb_t(0xEF, 0x12, 0x47, 0x7B)); if (mouse_hit && x1 <= mouse_x && x2 > mouse_x && y1 <= mouse_y && y2 > mouse_y) @@ -1896,7 +1895,6 @@ void ui_menu_select_software::draw_right_panel(void *selectedref, float origx1, float ar_x1 = ar_x0 + lr_arrow_width; float ar_y1 = 0.5f * (origy2 + origy1) + 0.9f * space; - //machine().ui().draw_outlined_box(container, origx1, origy1, origx2, origy2, UI_BACKGROUND_COLOR); mui.draw_outlined_box(container, origx1, origy1, origx2, origy2, rgb_t(0xEF, 0x12, 0x47, 0x7B)); if (mouse_hit && origx1 <= mouse_x && x2 > mouse_x && origy1 <= mouse_y && origy2 > mouse_y) |