mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-11 00:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1331 from Swizzy/master

Browse Source 
Some XDK360 fixes
This commit is contained in:
Twinaphex 2015-01-09 17:41:11 +01:00
commit 9274a6a1ae
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/d3d/d3d_wrapper.cpp
View File

@ -331,6 +331,7 @@ void d3d_texture_blit(void *data, void *renderchain_data,
return; return;
#ifdef _XBOX #ifdef _XBOX
d3d_set_texture(d3d->dev, 0, NULL); // Set the texture to null so D3D don't complain about it being in use...
D3DTexture_LockRect(tex, 0, lr, NULL, D3DLOCK_NOSYSLOCK); D3DTexture_LockRect(tex, 0, lr, NULL, D3DLOCK_NOSYSLOCK);
#if defined(_XBOX360) #if defined(_XBOX360)
D3DSURFACE_DESC desc; D3DSURFACE_DESC desc;

33
menu/disp/rmenu_xui.cpp
View File

@ -52,6 +52,7 @@ HXUIOBJ m_menutitlebottom;
HXUIOBJ m_back; HXUIOBJ m_back;
HXUIOBJ root_menu; HXUIOBJ root_menu;
HXUIOBJ current_menu; HXUIOBJ current_menu;
HXUIFONT m_menufont;
static msg_queue_t *xui_msg_queue; static msg_queue_t *xui_msg_queue;
class CRetroArch : public CXuiModule class CRetroArch : public CXuiModule
@ -145,6 +146,7 @@ HRESULT CRetroArchMain::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
GetChildById(L"XuiMenuList", &m_menulist); GetChildById(L"XuiMenuList", &m_menulist);
GetChildById(L"XuiTxtTitle", &m_menutitle); GetChildById(L"XuiTxtTitle", &m_menutitle);
GetChildById(L"XuiTxtBottom", &m_menutitlebottom); GetChildById(L"XuiTxtBottom", &m_menutitlebottom);
XuiCreateFont(L"Arial Unicode MS", 14, XUI_FONT_STYLE_NORMAL, 0, &m_menufont);
char str[PATH_MAX_LENGTH]; char str[PATH_MAX_LENGTH];
snprintf(str, sizeof(str), "%s - %s", PACKAGE_VERSION, g_extern.title_buf); snprintf(str, sizeof(str), "%s - %s", PACKAGE_VERSION, g_extern.title_buf);
@ -444,15 +446,46 @@ static void rmenu_xui_render(void)
if(XuiHandleIsValid(hTextLeft)) if(XuiHandleIsValid(hTextLeft))
{ {
mbstowcs(msg_w, path_buf, sizeof(msg_w) / sizeof(wchar_t)); mbstowcs(msg_w, path_buf, sizeof(msg_w) / sizeof(wchar_t));
LPCWSTR currText = XuiTextElementGetText(hTextLeft);
XuiTextElementSetText(hTextLeft, msg_w); XuiTextElementSetText(hTextLeft, msg_w);
float width, height;
XuiElementGetBounds(hTextLeft, &width, &height);
if (!currText || wcscmp(currText, msg_w) || width <= 1)
{
XUIRect* pRect = new XUIRect();
XuiMeasureText(m_menufont, msg_w, -1, XUI_FONT_STYLE_NO_WORDWRAP, 0, pRect);
if (width < pRect->GetWidth())
XuiElementSetBounds(hTextLeft, pRect->GetWidth(), height);
}
} }
if(XuiHandleIsValid(hTextRight)) if(XuiHandleIsValid(hTextRight))
{ {
mbstowcs(msg_w, type_str, sizeof(msg_w) / sizeof(wchar_t)); mbstowcs(msg_w, type_str, sizeof(msg_w) / sizeof(wchar_t));
LPCWSTR currText = XuiTextElementGetText(hTextRight);
XuiTextElementSetText(hTextRight, msg_w); XuiTextElementSetText(hTextRight, msg_w);
float width, height;
XuiElementGetBounds(hTextRight, &width, &height);
if (!currText || wcscmp(currText, msg_w) || width <= 1) // Check if we need to adjust width
{
XUIRect* pRect = new XUIRect();
XuiMeasureText(m_menufont, msg_w, -1, XUI_FONT_STYLE_NO_WORDWRAP, 0, pRect);
XuiElementSetBounds(hTextRight, pRect->GetWidth(), height);
D3DXVECTOR3 textPos, rPos;
XuiElementGetPosition(hTextLeft, &textPos);
HXUIOBJ hRightEdge = NULL;
XuiElementGetChildById(hVisual, L"graphic_CapRight", &hRightEdge);
XuiElementGetPosition(hRightEdge, &rPos);
textPos.x = rPos.x - (pRect->GetWidth() + textPos.x);
XuiElementSetPosition(hTextRight, &textPos);
}
} }
} }
} }
XuiListSetCurSelVisible(m_menulist, driver.menu->selection_ptr);
if (driver.menu->keyboard.display) if (driver.menu->keyboard.display)
{ {