summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-02-15 16:35:15 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-02-15 16:35:15 +0100
commit1dc9266b930f5126cbd76e24fbbcf7acf3bb6bd4 (patch)
tree22065f8d533b6dfbff8ed26614b74342dcabc5d0
parent05214ecda55d379894a1a91d56c1863268b41c73 (diff)
draw FPS counter even in menus (nw)
will revert this when MG finish his work
-rw-r--r--src/emu/ui/menu.cpp7
-rw-r--r--src/emu/video.cpp2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/emu/ui/menu.cpp b/src/emu/ui/menu.cpp
index f831ffa725f..a06fb5e62ca 100644
--- a/src/emu/ui/menu.cpp
+++ b/src/emu/ui/menu.cpp
@@ -460,6 +460,13 @@ void ui_menu::set_selection(void *selected_itemref)
void ui_menu::draw(bool customonly, bool noimage, bool noinput)
{
+ // first draw the FPS counter
+ if (machine().ui().show_fps_counter())
+ {
+ machine().ui().draw_text_full(container, machine().video().speed_text().c_str(), 0.0f, 0.0f, 1.0f,
+ JUSTIFY_RIGHT, WRAP_WORD, DRAW_OPAQUE, ARGB_WHITE, ARGB_BLACK, nullptr, nullptr);
+ }
+
float line_height = machine().ui().get_line_height();
float lr_arrow_width = 0.4f * line_height * machine().render().ui_aspect();
float ud_arrow_width = line_height * machine().render().ui_aspect();
diff --git a/src/emu/video.cpp b/src/emu/video.cpp
index 11f081636b8..7dc9470d54a 100644
--- a/src/emu/video.cpp
+++ b/src/emu/video.cpp
@@ -684,7 +684,7 @@ inline int video_manager::effective_frameskip() const
inline bool video_manager::effective_throttle() const
{
// if we're paused, or if the UI is active, we always throttle
- if (machine().paused() || machine().ui().is_menu_active())
+ if (machine().paused()) //|| machine().ui().is_menu_active())
return true;
// if we're fast forwarding, we don't throttle