mirror of
https://github.com/libretro/RetroArch
synced 2025-02-21 18:40:09 +00:00
(XDK360) New XUI Code
Signed-off-by: Swizzy <swizzy@xeupd.com>
This commit is contained in:
parent
cbfd7ad881
commit
d60b5783a2
@ -29,6 +29,7 @@
|
|||||||
<Width>723.120056</Width>
|
<Width>723.120056</Width>
|
||||||
<Height>367.040009</Height>
|
<Height>367.040009</Height>
|
||||||
<Position>44.880005,64.959991,0.000000</Position>
|
<Position>44.880005,64.959991,0.000000</Position>
|
||||||
|
<Visual>XuiList_Custom</Visual>
|
||||||
</Properties>
|
</Properties>
|
||||||
<XuiListItem>
|
<XuiListItem>
|
||||||
<Properties>
|
<Properties>
|
||||||
@ -354,6 +355,17 @@
|
|||||||
<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
|
<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
|
||||||
</Properties>
|
</Properties>
|
||||||
</XuiListItem>
|
</XuiListItem>
|
||||||
|
<XuiListItem>
|
||||||
|
<Properties>
|
||||||
|
<Id>control_ListItem</Id>
|
||||||
|
<Width>254.000000</Width>
|
||||||
|
<Height>40.000000</Height>
|
||||||
|
<Position>7.000000,26.000000,0.000000</Position>
|
||||||
|
<Anchor>5</Anchor>
|
||||||
|
<Show>false</Show>
|
||||||
|
<Visual>XuiButton_two_col</Visual>
|
||||||
|
</Properties>
|
||||||
|
</XuiListItem>
|
||||||
</XuiCommonList>
|
</XuiCommonList>
|
||||||
<XuiText>
|
<XuiText>
|
||||||
<Properties>
|
<Properties>
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -29,6 +29,7 @@
|
|||||||
<Width>466.000000</Width>
|
<Width>466.000000</Width>
|
||||||
<Height>272.720001</Height>
|
<Height>272.720001</Height>
|
||||||
<Position>24.880005,52.959991,0.000000</Position>
|
<Position>24.880005,52.959991,0.000000</Position>
|
||||||
|
<Visual>XuiList_Custom</Visual>
|
||||||
</Properties>
|
</Properties>
|
||||||
<XuiListItem>
|
<XuiListItem>
|
||||||
<Properties>
|
<Properties>
|
||||||
@ -282,6 +283,17 @@
|
|||||||
<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
|
<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
|
||||||
</Properties>
|
</Properties>
|
||||||
</XuiListItem>
|
</XuiListItem>
|
||||||
|
<XuiListItem>
|
||||||
|
<Properties>
|
||||||
|
<Id>control_ListItem</Id>
|
||||||
|
<Width>254.000000</Width>
|
||||||
|
<Height>40.000000</Height>
|
||||||
|
<Position>7.000000,26.000000,0.000000</Position>
|
||||||
|
<Anchor>5</Anchor>
|
||||||
|
<Show>false</Show>
|
||||||
|
<Visual>XuiButton_two_col</Visual>
|
||||||
|
</Properties>
|
||||||
|
</XuiListItem>
|
||||||
</XuiCommonList>
|
</XuiCommonList>
|
||||||
<XuiText>
|
<XuiText>
|
||||||
<Properties>
|
<Properties>
|
||||||
|
@ -318,8 +318,7 @@ static void rmenu_xui_frame(void)
|
|||||||
|
|
||||||
XUIMessage msg;
|
XUIMessage msg;
|
||||||
XUIMessageRender msgRender;
|
XUIMessageRender msgRender;
|
||||||
XuiMessageRender( &msg, &msgRender,
|
XuiMessageRender( &msg, &msgRender, app.GetDC(), 0xffffffff, XUI_BLEND_NORMAL );
|
||||||
app.GetDC(), 0xffffffff, XUI_BLEND_NORMAL );
|
|
||||||
XuiSendMessage( app.GetRootObj(), &msg );
|
XuiSendMessage( app.GetRootObj(), &msg );
|
||||||
|
|
||||||
XuiRenderSetViewTransform( app.GetDC(), &matOrigView );
|
XuiRenderSetViewTransform( app.GetDC(), &matOrigView );
|
||||||
@ -366,7 +365,6 @@ static void rmenu_xui_render(void)
|
|||||||
g_extern.is_menu && !driver.menu->msg_force)
|
g_extern.is_menu && !driver.menu->msg_force)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
begin = driver.menu->selection_ptr;
|
|
||||||
end = menu_list_get_size(driver.menu->menu_list);
|
end = menu_list_get_size(driver.menu->menu_list);
|
||||||
|
|
||||||
rmenu_xui_render_background();
|
rmenu_xui_render_background();
|
||||||
@ -374,8 +372,7 @@ static void rmenu_xui_render(void)
|
|||||||
menu_list_get_last_stack(driver.menu->menu_list, &dir,
|
menu_list_get_last_stack(driver.menu->menu_list, &dir,
|
||||||
&label, &menu_type);
|
&label, &menu_type);
|
||||||
|
|
||||||
get_title(label, dir, menu_type,
|
get_title(label, dir, menu_type, title, sizeof(title));
|
||||||
title, sizeof(title));
|
|
||||||
|
|
||||||
mbstowcs(strw_buffer, title, sizeof(strw_buffer) / sizeof(wchar_t));
|
mbstowcs(strw_buffer, title, sizeof(strw_buffer) / sizeof(wchar_t));
|
||||||
XuiTextElementSetText(m_menutitle, strw_buffer);
|
XuiTextElementSetText(m_menutitle, strw_buffer);
|
||||||
@ -410,11 +407,9 @@ static void rmenu_xui_render(void)
|
|||||||
x = RXUI_TERM_START_X;
|
x = RXUI_TERM_START_X;
|
||||||
y = RXUI_TERM_START_Y;
|
y = RXUI_TERM_START_Y;
|
||||||
|
|
||||||
for (i = begin; i < end; i++/*, y += FONT_HEIGHT_STRIDE */)
|
for (i = 0; i < end; i++/*, y += FONT_HEIGHT_STRIDE */)
|
||||||
{
|
{
|
||||||
char message[PATH_MAX_LENGTH], type_str[PATH_MAX_LENGTH],
|
char type_str[PATH_MAX_LENGTH],entry_title_buf[PATH_MAX_LENGTH], path_buf[PATH_MAX_LENGTH];
|
||||||
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH],
|
|
||||||
path_buf[PATH_MAX_LENGTH];
|
|
||||||
const char *path = NULL, *entry_label = NULL;
|
const char *path = NULL, *entry_label = NULL;
|
||||||
unsigned type = 0, w = 0;
|
unsigned type = 0, w = 0;
|
||||||
bool selected = false;
|
bool selected = false;
|
||||||
@ -436,15 +431,27 @@ static void rmenu_xui_render(void)
|
|||||||
else
|
else
|
||||||
menu_ticker_line(type_str_buf, w, g_extern.frame_count / 15, type_str, selected);
|
menu_ticker_line(type_str_buf, w, g_extern.frame_count / 15, type_str, selected);
|
||||||
#endif
|
#endif
|
||||||
|
HXUIOBJ hVisual = NULL;
|
||||||
snprintf(message, sizeof(message), "%s : %s",
|
HXUIOBJ hControl = XuiListGetItemControl(m_menulist, i);
|
||||||
type_str,
|
if (XuiHandleIsValid(hControl))
|
||||||
path_buf);
|
XuiControlGetVisual(hControl, &hVisual);
|
||||||
|
if(XuiHandleIsValid(hVisual))
|
||||||
wchar_t msg_w[256];
|
{
|
||||||
mbstowcs(msg_w, message, sizeof(msg_w) / sizeof(wchar_t));
|
HXUIOBJ hTextLeft = NULL, hTextRight = NULL;
|
||||||
XuiListSetText(m_menulist, i, msg_w);
|
XuiElementGetChildById(hVisual, L"LeftText", &hTextLeft);
|
||||||
blit_line(x, y, message, i);
|
XuiElementGetChildById(hVisual, L"RightText", &hTextRight);
|
||||||
|
wchar_t msg_w[256];
|
||||||
|
if(XuiHandleIsValid(hTextLeft))
|
||||||
|
{
|
||||||
|
mbstowcs(msg_w, path_buf, sizeof(msg_w) / sizeof(wchar_t));
|
||||||
|
XuiTextElementSetText(hTextLeft, msg_w);
|
||||||
|
}
|
||||||
|
if(XuiHandleIsValid(hTextRight))
|
||||||
|
{
|
||||||
|
mbstowcs(msg_w, type_str, sizeof(msg_w) / sizeof(wchar_t));
|
||||||
|
XuiTextElementSetText(hTextRight, msg_w);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (driver.menu->keyboard.display)
|
if (driver.menu->keyboard.display)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user