diff options
Diffstat (limited to 'src/frontend/mame/ui/dirmenu.cpp')
-rw-r--r-- | src/frontend/mame/ui/dirmenu.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/frontend/mame/ui/dirmenu.cpp b/src/frontend/mame/ui/dirmenu.cpp index 1d8166718f0..77e64b8463d 100644 --- a/src/frontend/mame/ui/dirmenu.cpp +++ b/src/frontend/mame/ui/dirmenu.cpp @@ -104,7 +104,7 @@ void menu_directory::populate(float &customtop, float &custombottom) item_append(_(elem.name), "", 0, (void *)(uintptr_t)elem.action); item_append(menu_item_type::SEPARATOR); - customtop = ui().get_line_height() + 3.0f * ui().box_tb_border(); + customtop = ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER; } //------------------------------------------------- @@ -116,9 +116,9 @@ void menu_directory::custom_render(void *selectedref, float top, float bottom, f char const *const toptext[] = { _("Folders Setup") }; draw_text_box( std::begin(toptext), std::end(toptext), - origx1, origx2, origy1 - top, origy1 - ui().box_tb_border(), + origx1, origx2, origy1 - top, origy1 - UI_BOX_TB_BORDER, ui::text_layout::CENTER, ui::text_layout::TRUNCATE, false, - ui().colors().text_color(), UI_GREEN_COLOR, 1.0f); + UI_TEXT_COLOR, UI_GREEN_COLOR, 1.0f); } /************************************************** @@ -182,7 +182,7 @@ void menu_display_actual::populate(float &customtop, float &custombottom) item_append(_("Remove Folder"), "", 0, (void *)REMOVE); item_append(menu_item_type::SEPARATOR); - customtop = (m_folders.size() + 1) * ui().get_line_height() + 6.0f * ui().box_tb_border(); + customtop = (m_folders.size() + 1) * ui().get_line_height() + 6.0f * UI_BOX_TB_BORDER; } //------------------------------------------------- @@ -194,14 +194,14 @@ void menu_display_actual::custom_render(void *selectedref, float top, float bott float const lineheight(ui().get_line_height()); float const maxwidth(draw_text_box( std::begin(m_folders), std::end(m_folders), - origx1, origx2, origy1 - (3.0f * ui().box_tb_border()) - (m_folders.size() * lineheight), origy1 - ui().box_tb_border(), + origx1, origx2, origy1 - (3.0f * UI_BOX_TB_BORDER) - (m_folders.size() * lineheight), origy1 - UI_BOX_TB_BORDER, ui::text_layout::CENTER, ui::text_layout::TRUNCATE, false, - ui().colors().text_color(), ui().colors().background_color(), 1.0f)); + UI_TEXT_COLOR, UI_BACKGROUND_COLOR, 1.0f)); draw_text_box( std::begin(m_heading), std::end(m_heading), - 0.5f * (1.0f - maxwidth), 0.5f * (1.0f + maxwidth), origy1 - top, origy1 - top + lineheight + (2.0f * ui().box_tb_border()), + 0.5f * (1.0f - maxwidth), 0.5f * (1.0f + maxwidth), origy1 - top, origy1 - top + lineheight + (2.0f * UI_BOX_TB_BORDER), ui::text_layout::CENTER, ui::text_layout::TRUNCATE, false, - ui().colors().text_color(), UI_GREEN_COLOR, 1.0f); + UI_TEXT_COLOR, UI_GREEN_COLOR, 1.0f); } /************************************************** @@ -403,8 +403,8 @@ void menu_add_change_folder::populate(float &customtop, float &custombottom) item_append(menu_item_type::SEPARATOR); // configure the custom rendering - customtop = 2.0f * ui().get_line_height() + 3.0f * ui().box_tb_border(); - custombottom = 1.0f * ui().get_line_height() + 3.0f * ui().box_tb_border(); + customtop = 2.0f * ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER; + custombottom = 1.0f * ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER; } //------------------------------------------------- @@ -421,17 +421,17 @@ void menu_add_change_folder::custom_render(void *selectedref, float top, float b m_current_path }; draw_text_box( std::begin(toptext), std::end(toptext), - origx1, origx2, origy1 - top, origy1 - ui().box_tb_border(), + origx1, origx2, origy1 - top, origy1 - UI_BOX_TB_BORDER, ui::text_layout::CENTER, ui::text_layout::NEVER, false, - ui().colors().text_color(), UI_GREEN_COLOR, 1.0f); + UI_TEXT_COLOR, UI_GREEN_COLOR, 1.0f); // bottom text char const *const bottomtext[] = { _("Press TAB to set") }; draw_text_box( std::begin(bottomtext), std::end(bottomtext), - origx1, origx2, origy2 + ui().box_tb_border(), origy2 + bottom, + origx1, origx2, origy2 + UI_BOX_TB_BORDER, origy2 + bottom, ui::text_layout::CENTER, ui::text_layout::TRUNCATE, false, - ui().colors().text_color(), UI_RED_COLOR, 1.0f); + UI_TEXT_COLOR, UI_RED_COLOR, 1.0f); } /************************************************** @@ -501,7 +501,7 @@ void menu_remove_folder::populate(float &customtop, float &custombottom) item_append(elem, "", 0, (void *)(uintptr_t)++folders_count); item_append(menu_item_type::SEPARATOR); - customtop = ui().get_line_height() + 3.0f * ui().box_tb_border(); + customtop = ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER; } //------------------------------------------------- @@ -513,9 +513,9 @@ void menu_remove_folder::custom_render(void *selectedref, float top, float botto std::string const toptext[] = {string_format(_("Remove %1$s Folder"), _(s_folders[m_ref].name)) }; draw_text_box( std::begin(toptext), std::end(toptext), - origx1, origx2, origy1 - top, origy1 - ui().box_tb_border(), + origx1, origx2, origy1 - top, origy1 - UI_BOX_TB_BORDER, ui::text_layout::CENTER, ui::text_layout::TRUNCATE, false, - ui().colors().text_color(), UI_GREEN_COLOR, 1.0f); + UI_TEXT_COLOR, UI_GREEN_COLOR, 1.0f); } } // namespace ui |