summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend
diff options
context:
space:
mode:
Diffstat (limited to 'src/frontend')
-rw-r--r--src/frontend/mame/ui/ui.cpp13
-rw-r--r--src/frontend/mame/ui/viewgfx.cpp42
-rw-r--r--src/frontend/mame/ui/viewgfx.h2
3 files changed, 27 insertions, 30 deletions
diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
index 9439ec05fca..a9982cda434 100644
--- a/src/frontend/mame/ui/ui.cpp
+++ b/src/frontend/mame/ui/ui.cpp
@@ -1170,7 +1170,7 @@ void mame_ui_manager::draw_text_full(
x, y, origwrapwidth,
justify, wrap,
draw, fgcolor, bgcolor,
- totalwidth, totalwidth,
+ totalwidth, totalheight,
text_size, machine().render().ui_aspect(target));
}
@@ -1189,7 +1189,7 @@ void mame_ui_manager::draw_text_full(
x, y, origwrapwidth,
justify, wrap,
draw, fgcolor, bgcolor,
- totalwidth, totalwidth,
+ totalwidth, totalheight,
text_size, machine().render().ui_aspect(container));
}
@@ -1763,15 +1763,14 @@ uint32_t mame_ui_manager::handler_ingame()
}
if (!is_paused)
+ {
machine().pause();
+ m_paused_for_menu = true;
+ }
m_ui_target = &current_ui_target();
set_handler(
ui_callback_type::MENU,
- handler_callback_func(
- [this, is_paused] () -> uint32_t
- {
- return ui_gfx_ui_handler(*m_ui_target, *this, is_paused);
- }));
+ handler_callback_func([this] () { return ui_gfx_ui_handler(*m_ui_target, *this); }));
return 0;
}
diff --git a/src/frontend/mame/ui/viewgfx.cpp b/src/frontend/mame/ui/viewgfx.cpp
index a61dfb31556..7126a8a0195 100644
--- a/src/frontend/mame/ui/viewgfx.cpp
+++ b/src/frontend/mame/ui/viewgfx.cpp
@@ -52,11 +52,11 @@ public:
m_machine.render().texture_free(m_texture);
}
- uint32_t handle(mame_ui_manager &mui, render_target &target, bool uistate)
+ uint32_t handle(mame_ui_manager &mui, render_target &target)
{
// implicitly cancel if there's nothing to display
if (!is_relevant())
- return cancel(uistate);
+ return cancel();
// let the OSD do its thing
mui.machine().osd().check_osd_inputs();
@@ -145,19 +145,19 @@ public:
{
case view::PALETTE:
if (m_palette.interface())
- return handle_palette(mui, target, uistate);
+ return handle_palette(mui, target);
m_mode = view::GFXSET;
break;
case view::GFXSET:
if (m_gfxset.has_gfx())
- return handle_gfxset(mui, target, uistate);
+ return handle_gfxset(mui, target);
m_mode = view::TILEMAP;
break;
case view::TILEMAP:
if (m_machine.tilemap().count())
- return handle_tilemap(mui, target, uistate);
+ return handle_tilemap(mui, target);
m_mode = view::PALETTE;
break;
}
@@ -581,7 +581,7 @@ private:
return m_palette.interface() || m_gfxset.has_gfx() || m_machine.tilemap().count();
}
- uint32_t handle_general_keys(bool uistate)
+ uint32_t handle_general_keys()
{
auto &input = m_machine.ui_input();
@@ -610,15 +610,13 @@ private:
// cancel or graphics viewer dismisses the viewer
if (input.pressed(IPT_UI_BACK) || input.pressed(IPT_UI_SHOW_GFX))
- return cancel(uistate);
+ return cancel();
- return uistate;
+ return 0;
}
- uint32_t cancel(bool uistate)
+ uint32_t cancel()
{
- if (!uistate)
- m_machine.resume();
m_machine.ui_input().reset();
m_current_pointer = -1;
m_pointer_type = ui_event::pointer::UNKNOWN;
@@ -630,9 +628,9 @@ private:
return mame_ui_manager::HANDLER_CANCEL;
}
- uint32_t handle_palette(mame_ui_manager &mui, render_target &target, bool uistate);
- uint32_t handle_gfxset(mame_ui_manager &mui, render_target &target, bool uistate);
- uint32_t handle_tilemap(mame_ui_manager &mui, render_target &target, bool uistate);
+ uint32_t handle_palette(mame_ui_manager &mui, render_target &target);
+ uint32_t handle_gfxset(mame_ui_manager &mui, render_target &target);
+ uint32_t handle_tilemap(mame_ui_manager &mui, render_target &target);
void update_gfxset_bitmap(int xcells, int ycells, gfx_element &gfx);
void update_tilemap_bitmap(int width, int height);
@@ -986,7 +984,7 @@ bool gfx_viewer::tilemap::handle_keys(running_machine &machine, float pixelscale
}
-uint32_t gfx_viewer::handle_palette(mame_ui_manager &mui, render_target &target, bool uistate)
+uint32_t gfx_viewer::handle_palette(mame_ui_manager &mui, render_target &target)
{
device_palette_interface &palette = *m_palette.interface();
palette_device *const paldev = dynamic_cast<palette_device *>(&palette.device());
@@ -1138,11 +1136,11 @@ uint32_t gfx_viewer::handle_palette(mame_ui_manager &mui, render_target &target,
// handle keys
m_palette.handle_keys(m_machine);
- return handle_general_keys(uistate);
+ return handle_general_keys();
}
-uint32_t gfx_viewer::handle_gfxset(mame_ui_manager &mui, render_target &target, bool uistate)
+uint32_t gfx_viewer::handle_gfxset(mame_ui_manager &mui, render_target &target)
{
// get graphics info
auto &info = m_gfxset.m_devices[m_gfxset.m_device];
@@ -1340,11 +1338,11 @@ uint32_t gfx_viewer::handle_gfxset(mame_ui_manager &mui, render_target &target,
// handle keyboard navigation before drawing
if (m_gfxset.handle_keys(m_machine, xcells, ycells))
m_bitmap_dirty = true;
- return handle_general_keys(uistate);
+ return handle_general_keys();
}
-uint32_t gfx_viewer::handle_tilemap(mame_ui_manager &mui, render_target &target, bool uistate)
+uint32_t gfx_viewer::handle_tilemap(mame_ui_manager &mui, render_target &target)
{
// get some UI metrics
render_font *const ui_font = mui.get_font();
@@ -1480,7 +1478,7 @@ uint32_t gfx_viewer::handle_tilemap(mame_ui_manager &mui, render_target &target,
// handle keyboard input
if (m_tilemap.handle_keys(m_machine, pixelscale))
m_bitmap_dirty = true;
- return handle_general_keys(uistate);
+ return handle_general_keys();
}
@@ -1616,7 +1614,7 @@ void gfx_viewer::gfxset_draw_item(gfx_element &gfx, int index, int dstx, int dst
// create or modify gfx sets in VIDEO_START
//-------------------------------------------------
-uint32_t ui_gfx_ui_handler(render_target &target, mame_ui_manager &mui, bool uistate)
+uint32_t ui_gfx_ui_handler(render_target &target, mame_ui_manager &mui)
{
- return mui.get_session_data<gfx_viewer, gfx_viewer>(mui.machine()).handle(mui, target, uistate);
+ return mui.get_session_data<gfx_viewer, gfx_viewer>(mui.machine()).handle(mui, target);
}
diff --git a/src/frontend/mame/ui/viewgfx.h b/src/frontend/mame/ui/viewgfx.h
index 8db7fc7718e..3fdf3b61a7f 100644
--- a/src/frontend/mame/ui/viewgfx.h
+++ b/src/frontend/mame/ui/viewgfx.h
@@ -21,7 +21,7 @@
***************************************************************************/
// master handler
-uint32_t ui_gfx_ui_handler(render_target &target, mame_ui_manager &mui, bool uistate);
+uint32_t ui_gfx_ui_handler(render_target &target, mame_ui_manager &mui);
#endif // MAME_FRONTEND_MAME_UI_VIEWGFX_H