summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend/mame/ui/custui.h
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-11-16 15:16:15 +1100
committer Vas Crabb <vas@vastheman.com>2019-11-17 00:31:48 +1100
commit9e2601c56b315eef4689811610b0f1451ed5a06d (patch)
tree112e38e4b648747b23a65f06aec6f2f7d675bc69 /src/frontend/mame/ui/custui.h
parentbe02946025e1079125a85b0d832cfa537f9aa122 (diff)
UI updates:
* Made DIP switch display scale with UI font and improved layout * Improved analog control display giving an indication of neutral position * Fixed menu heading sizes not being recalculated after font is changed
Diffstat (limited to 'src/frontend/mame/ui/custui.h')
-rw-r--r--src/frontend/mame/ui/custui.h20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/frontend/mame/ui/custui.h b/src/frontend/mame/ui/custui.h
index a419e424375..2da5cfd132b 100644
--- a/src/frontend/mame/ui/custui.h
+++ b/src/frontend/mame/ui/custui.h
@@ -15,7 +15,11 @@
#include "ui/menu.h"
+#include <functional>
+
+
namespace ui {
+
//-------------------------------------------------
// Custom UI menu
//-------------------------------------------------
@@ -23,7 +27,7 @@ namespace ui {
class menu_custom_ui : public menu
{
public:
- menu_custom_ui(mame_ui_manager &mui, render_container &container);
+ menu_custom_ui(mame_ui_manager &mui, render_container &container, std::function<void ()> &&handler);
virtual ~menu_custom_ui() override;
protected:
@@ -43,6 +47,7 @@ private:
static const char *const HIDE_STATUS[];
+ std::function<void ()> m_handler;
std::vector<std::string> m_lang;
std::uint16_t m_currlang;
};
@@ -54,7 +59,7 @@ private:
class menu_font_ui : public menu
{
public:
- menu_font_ui(mame_ui_manager &mui, render_container &container);
+ menu_font_ui(mame_ui_manager &mui, render_container &container, std::function<void (bool)> &&handler);
virtual ~menu_font_ui() override;
protected:
@@ -75,14 +80,19 @@ private:
void list();
+ std::function<void (bool)> m_handler;
+ std::vector<std::pair<std::string, std::string> > m_fonts;
+ const int m_font_min, m_font_max;
+ int m_font_size;
+ const float m_info_min, m_info_max;
+ float m_info_size;
+ bool m_changed;
+
std::uint16_t m_actual;
- std::vector<std::pair<std::string, std::string> > m_fonts;
#ifdef UI_WINDOWS
bool m_bold, m_italic;
#endif
- float m_info_min, m_info_max, m_info_size;
- int m_font_min, m_font_max, m_font_size;
};
//-------------------------------------------------