summaryrefslogtreecommitdiffstats
path: root/src/frontend/mame/ui/inputmap.cpp
diff options
context:
space:
mode:
author npwoods <npwoods@alumni.cmu.edu>2019-06-30 12:16:44 -0400
committer R. Belmont <rb6502@users.noreply.github.com>2019-06-30 12:16:44 -0400
commit1047b8cafeab7a32eefec524ca0621573186c125 (patch)
tree4f0db565575ce5eee913bc1cc29c4bcf2a8cd164 /src/frontend/mame/ui/inputmap.cpp
parent66939696f1e68ec35964c3577b256131603fcc8a (diff)
Refactored UI font metrics (#5291)
* Changed the various usages of UI_*COLOR to be calls to src/frontend/mame/ui/moptions.h The various UI_*COLOR macros were implemented as calls to decode_ui_color, which cached the values for the various options in a static array, which was obviously a gross hack. This refactoring is strategic because I am trying to confine awareness of mame_ui_manager to code in src/frontend/mame/ui, and the implementation of decode_ui_color() relied on the ability to access mame_ui_manager as a singleton from outside this code. * Created a ui_colors object, so that queries for UI RGB values would not always require parsing strings * Replaced UI_TARGET_FONT_[ROWS|HEIGHT] and UI_BOX_[LR|TD]_BORDER macros with property calls These macros were implemented with a call to a function (get_font_rows()) that opportunistically stashed the results of option accesses in static variables; in other words, a gross hack Because get_font_rows() attempted to access mame_ui_manager as a singleton, it was an obstactle to providing an alternative implementation of ui_manager * Remove stray debugging cruft that found a way into the other PR
Diffstat (limited to 'src/frontend/mame/ui/inputmap.cpp')
-rw-r--r--src/frontend/mame/ui/inputmap.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/frontend/mame/ui/inputmap.cpp b/src/frontend/mame/ui/inputmap.cpp
index 0170dc1d09d..a2bbf3b7a21 100644
--- a/src/frontend/mame/ui/inputmap.cpp
+++ b/src/frontend/mame/ui/inputmap.cpp
@@ -640,7 +640,7 @@ void menu_settings_dip_switches::custom_render(void *selectedref, float top, flo
return;
// add borders
- y1 = y2 + UI_BOX_TB_BORDER;
+ y1 = y2 + ui().box_tb_border();
y2 = y1 + bottom;
// draw extra menu area
@@ -693,7 +693,7 @@ void menu_settings_dip_switches::custom_render_one(float x1, float y1, float x2,
ui().draw_text_full(container(),
dip->name,
0,
- y1 + (DIP_SWITCH_HEIGHT - UI_TARGET_FONT_HEIGHT) / 2,
+ y1 + (DIP_SWITCH_HEIGHT - ui().target_font_height()) / 2,
x1 - ui().get_string_width(" "),
ui::text_layout::RIGHT,
ui::text_layout::NEVER,