From 697ff7bd7149d635a838543b65409dd42d739087 Mon Sep 17 00:00:00 2001 From: npwoods Date: Fri, 28 Jun 2019 17:30:09 -0400 Subject: Changed the various usages of UI_*COLOR to be calls to src/frontend/mame/ui/moptions.h (#5282) * 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 * Converted a few more options().zyx_color() to colors().zyx_color() * A few more misses from earlier --- src/frontend/mame/ui/submenu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/frontend/mame/ui/submenu.cpp') diff --git a/src/frontend/mame/ui/submenu.cpp b/src/frontend/mame/ui/submenu.cpp index fd0dcc14f7b..4a6690cd443 100644 --- a/src/frontend/mame/ui/submenu.cpp +++ b/src/frontend/mame/ui/submenu.cpp @@ -429,7 +429,7 @@ void submenu::custom_render(void *selectedref, float top, float bottom, float or std::begin(toptext), std::end(toptext), origx1, origx2, origy1 - top, origy1 - UI_BOX_TB_BORDER, ui::text_layout::CENTER, ui::text_layout::TRUNCATE, false, - UI_TEXT_COLOR, UI_GREEN_COLOR, 1.0f); + ui().colors().text_color(), UI_GREEN_COLOR, 1.0f); if (selectedref) { @@ -441,7 +441,7 @@ void submenu::custom_render(void *selectedref, float top, float bottom, float or std::begin(bottomtext), std::end(bottomtext), origx1, origx2, origy2 + UI_BOX_TB_BORDER, origy2 + bottom, ui::text_layout::CENTER, ui::text_layout::TRUNCATE, false, - UI_TEXT_COLOR, UI_RED_COLOR, 1.0f); + ui().colors().text_color(), UI_RED_COLOR, 1.0f); } } } -- cgit v1.2.3-70-g09d2