Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1421 from dankan1890/custui_custom_render_fix

Browse Source 
custui: fixed custom renderer alignment. (nw)
This commit is contained in:
Vas Crabb 2016-09-18 10:13:34 +10:00 committed by GitHub
commit 9dbf0946c8
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/frontend/mame/ui/custui.cpp
View File

@ -43,7 +43,7 @@ menu_custom_ui::menu_custom_ui(mame_ui_manager &mui, render_container &container
auto lang = mui.machine().options().language(); auto lang = mui.machine().options().language();
const osd::directory::entry *dirent; const osd::directory::entry *dirent;
std::size_t cnt = 0; std::size_t cnt = 0;
while ((dirent = path.next()) != nullptr) while ((dirent = path.next()))
{ {
if (dirent->type == osd::directory::entry::entry_type::DIR && strcmp(dirent->name, ".") != 0 && strcmp(dirent->name, "..") != 0) if (dirent->type == osd::directory::entry::entry_type::DIR && strcmp(dirent->name, ".") != 0 && strcmp(dirent->name, "..") != 0)
{ {
@ -829,6 +829,7 @@ void menu_rgb_ui::populate()
// set filter arrow // set filter arrow
UINT32 arrow_flags = FLAG_LEFT_ARROW | FLAG_RIGHT_ARROW; UINT32 arrow_flags = FLAG_LEFT_ARROW | FLAG_RIGHT_ARROW;
std::string s_text = std::string(m_search).append("_"); std::string s_text = std::string(m_search).append("_");
item_append(_("ARGB Settings"), "", FLAG_DISABLE | FLAG_UI_HEADING, nullptr);
if (m_lock_ref != RGB_ALPHA) if (m_lock_ref != RGB_ALPHA)
{ {
@ -878,9 +879,8 @@ void menu_rgb_ui::custom_render(void *selectedref, float top, float bottom, floa
float width, maxwidth = origx2 - origx1; float width, maxwidth = origx2 - origx1;
// top text // top text
std::string topbuf = std::string(m_title).append(_(" - ARGB Settings")); ui().draw_text_full(container(), m_title.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
ui().draw_text_full(container(), topbuf.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER, mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width);
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
width += 2 * UI_BOX_LR_BORDER; width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(maxwidth, width); maxwidth = std::max(maxwidth, width);
@ -899,41 +899,37 @@ void menu_rgb_ui::custom_render(void *selectedref, float top, float bottom, floa
y1 += UI_BOX_TB_BORDER; y1 += UI_BOX_TB_BORDER;
// draw the text within it // draw the text within it
ui().draw_text_full(container(), topbuf.c_str(), x1, y1, x2 - x1, ui::text_layout::CENTER, ui::text_layout::NEVER, ui().draw_text_full(container(), m_title.c_str(), x1, y1, x2 - x1, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); mame_ui_manager::NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR);
std::string sampletxt(_("Color preview =")); std::string sampletxt(_("Color preview ="));
maxwidth = origx2 - origx1;
ui().draw_text_full(container(), sampletxt.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER, ui().draw_text_full(container(), sampletxt.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr); mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width);
width += 2 * UI_BOX_LR_BORDER; width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(maxwidth, width); maxwidth = std::max(origx2 - origx1, width);
// compute our bounds // compute our bounds
x1 -= UI_BOX_LR_BORDER; x1 = 0.5f - 0.5f * maxwidth;
x2 = x1 + width; x2 = x1 + maxwidth;
y1 = origy2 + UI_BOX_TB_BORDER; y1 = origy2 + UI_BOX_TB_BORDER;
y2 = origy2 + bottom; y2 = origy2 + bottom;
// draw a box // draw a box
ui().draw_outlined_box(container(), x1, y1, x2, y2, UI_RED_COLOR); ui().draw_outlined_box(container(), x1, y1, x1 + width, y2, UI_RED_COLOR);
// take off the borders // take off the borders
x1 += UI_BOX_LR_BORDER; x1 += UI_BOX_LR_BORDER;
x2 -= UI_BOX_LR_BORDER;
y1 += UI_BOX_TB_BORDER; y1 += UI_BOX_TB_BORDER;
// draw the normal text // draw the normal text
ui().draw_text_full(container(), sampletxt.c_str(), x1, y1, x2 - x1, ui::text_layout::CENTER, ui::text_layout::NEVER, ui().draw_text_full(container(), sampletxt.c_str(), x1, y1, width - UI_BOX_LR_BORDER, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NORMAL, rgb_t::white, rgb_t::black, nullptr, nullptr); mame_ui_manager::NORMAL, rgb_t::white, rgb_t::black);
float t_x2 = x1 - UI_BOX_LR_BORDER + maxwidth; x1 += width + UI_BOX_LR_BORDER;
x1 = x2 + 2.0f * UI_BOX_LR_BORDER;
x2 = t_x2;
y1 -= UI_BOX_TB_BORDER; y1 -= UI_BOX_TB_BORDER;
// draw color box
ui().draw_outlined_box(container(), x1, y1, x2, y2, *m_color); ui().draw_outlined_box(container(), x1, y1, x2, y2, *m_color);
} }
//------------------------------------------------- //-------------------------------------------------