diff options
author | 2016-02-29 10:22:58 +0100 | |
---|---|---|
committer | 2016-02-29 10:22:58 +0100 | |
commit | d5ce1264a5dca03ded7ce3c8f4542c977625ec20 (patch) | |
tree | 9b959eb5160b9d4f74d7b3ddb3604c9bb3d1657e | |
parent | 7936291894faa9cc3df6039b8794c01b988055ed (diff) |
ui: changed filter label from "Originals" to "Parents" (MT06143)
-rw-r--r-- | src/emu/ui/menu.cpp | 8 | ||||
-rw-r--r-- | src/emu/ui/moptions.cpp | 2 | ||||
-rw-r--r-- | src/emu/ui/selgame.cpp | 5 | ||||
-rw-r--r-- | src/emu/ui/utils.cpp | 6 |
4 files changed, 9 insertions, 12 deletions
diff --git a/src/emu/ui/menu.cpp b/src/emu/ui/menu.cpp index f004d78c18d..f6154c41638 100644 --- a/src/emu/ui/menu.cpp +++ b/src/emu/ui/menu.cpp @@ -1587,19 +1587,17 @@ void ui_menu::draw_select_game(bool noinput) { fgcolor = rgb_t(0xff, 0xff, 0xff, 0x00); bgcolor = rgb_t(0xff, 0xff, 0xff, 0xff); + mui.draw_textured_box(container, line_x0 + 0.01f, line_y0, line_x1 - 0.01f, line_y1, bgcolor, rgb_t(255, 43, 43, 43), + hilight_main_texture, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_TEXWRAP(TRUE)); } // else if the mouse is over this item, draw with a different background else if (count == hover) { fgcolor = UI_MOUSEOVER_COLOR; bgcolor = UI_MOUSEOVER_BG_COLOR; + highlight(container, line_x0, line_y0, line_x1, line_y1, bgcolor); } - // if we have some background hilighting to do, add a quad behind everything else - if (bgcolor != UI_TEXT_BG_COLOR) - mui.draw_textured_box(container, line_x0 + 0.01f, line_y0, line_x1 - 0.01f, line_y1, bgcolor, rgb_t(255, 43, 43, 43), - hilight_main_texture, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_TEXWRAP(TRUE)); - if (strcmp(itemtext, MENU_SEPARATOR_ITEM) == 0) container->add_line(visible_left, line + 0.5f * line_height, visible_left + visible_width, line + 0.5f * line_height, UI_LINE_WIDTH, UI_TEXT_COLOR, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA)); diff --git a/src/emu/ui/moptions.cpp b/src/emu/ui/moptions.cpp index 4ab64fb38f7..de0b627ee9f 100644 --- a/src/emu/ui/moptions.cpp +++ b/src/emu/ui/moptions.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Dankan1890 +// copyright-holders:Maurizio Petrarota /*************************************************************************** ui/moptions.c diff --git a/src/emu/ui/selgame.cpp b/src/emu/ui/selgame.cpp index 7b48de112fc..d45a9dbd1d5 100644 --- a/src/emu/ui/selgame.cpp +++ b/src/emu/ui/selgame.cpp @@ -1768,17 +1768,16 @@ float ui_menu_select_game::draw_left_panel(float x1, float y1, float x2, float y bgcolor = UI_MOUSEOVER_BG_COLOR; fgcolor = UI_MOUSEOVER_COLOR; hover = phover + filter; + ui_menu::highlight(container, x1, y1, x2, y1+ line_height_max, bgcolor); } if (highlight == filter && m_focus == focused_menu::left) { fgcolor = rgb_t(0xff, 0xff, 0xff, 0x00); bgcolor = rgb_t(0xff, 0xff, 0xff, 0xff); - } - - if (bgcolor != UI_TEXT_BG_COLOR) mui.draw_textured_box(container, x1, y1, x2, y1 + line_height_max, bgcolor, rgb_t(255, 43, 43, 43), hilight_main_texture, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_TEXWRAP(TRUE)); + } float x1t = x1 + text_sign; if (afilter == FILTER_CUSTOM) diff --git a/src/emu/ui/utils.cpp b/src/emu/ui/utils.cpp index 333ee95971a..1e998d04c9d 100644 --- a/src/emu/ui/utils.cpp +++ b/src/emu/ui/utils.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Dankan1890 +// copyright-holders:Maurizio Petrarota /*************************************************************************** ui/utils.cpp @@ -26,13 +26,13 @@ std::vector<std::string> c_mnfct::ui; // Main filters UINT16 main_filters::actual = 0; const char *main_filters::text[] = { "All", "Available", "Unavailable", "Working", "Not Working", "Mechanical", "Not Mechanical", - "Category", "Favorites", "BIOS", "Originals", "Clones", "Manufacturers", "Years", "Support Save", + "Category", "Favorites", "BIOS", "Parents", "Clones", "Manufacturers", "Years", "Support Save", "Not Support Save", "CHD", "No CHD", "Vertical", "Horizontal", "Custom" }; size_t main_filters::length = ARRAY_LENGTH(main_filters::text); // Software filters UINT16 sw_filters::actual = 0; -const char *sw_filters::text[] = { "All", "Available", "Unavailable", "Originals", "Clones", "Years", "Publishers", "Supported", +const char *sw_filters::text[] = { "All", "Available", "Unavailable", "Parents", "Clones", "Years", "Publishers", "Supported", "Partial Supported", "Unsupported", "Region", "Device Type", "Software List", "Custom" }; size_t sw_filters::length = ARRAY_LENGTH(sw_filters::text); |