(RMenu XUI) Have filebrowsers use the same XUI file

frontend/menu/rmenu_xui.cpp

@@ -150,9 +150,6 @@ class CRetroArchMain: public CXuiSceneImpl
 
 class CRetroArchFileBrowser: public CXuiSceneImpl
 {
-   protected:
-
-      HXUIOBJ m_dir_game;
    public:
       HRESULT OnInit( XUIMessageInit* pInitData, int & bHandled );
       HRESULT OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled );
@@ -554,8 +551,6 @@ class CRetroArchControls: public CXuiSceneImpl
 };
 
 CRetroArch app;
-HXUIOBJ m_list;
-HXUIOBJ m_list_path;
 HXUIOBJ hCur;
 
 wchar_t strw_buffer[PATH_MAX];
@@ -625,26 +620,25 @@ void filebrowser_fetch_directory_entries(uint64_t action)
    filebrowser_update(rgui->browser, action, rgui->browser->current_dir.extensions); 
 
    mbstowcs(strw_buffer, rgui->browser->current_dir.directory_path, sizeof(strw_buffer) / sizeof(wchar_t));
-   XuiTextElementSetText(m_list_path, strw_buffer);
+   XuiTextElementSetText(m_menutitle, strw_buffer);
 
-   XuiListDeleteItems(m_list, 0, XuiListGetItemCount(m_list));
+   XuiListDeleteItems(m_menulist, 0, XuiListGetItemCount(m_menulist));
-   XuiListInsertItems(m_list, 0, rgui->browser->list->size);
+   XuiListInsertItems(m_menulist, 0, rgui->browser->list->size);
 
    for(unsigned i = 0; i < rgui->browser->list->size; i++)
    {
       char fname_tmp[256];
       fill_pathname_base(fname_tmp, rgui->browser->list->elems[i].data, sizeof(fname_tmp));
       mbstowcs(strw_buffer, fname_tmp, sizeof(strw_buffer) / sizeof(wchar_t));
-      XuiListSetText(m_list, i, strw_buffer);
+      XuiListSetText(m_menulist, i, strw_buffer);
    }
 }
 
 HRESULT CRetroArchFileBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
 {
-   GetChildById(L"XuiRomList", &m_list);
+   GetChildById(L"XuiMenuList", &m_menulist);
-   GetChildById(L"XuiBackButton1", &m_back);
+   GetChildById(L"XuiTxtTitle", &m_menutitle);
-   GetChildById(L"XuiTxtRomPath", &m_list_path);
+   GetChildById(L"XuiTxtBottom", &m_menutitlebottom);
-   GetChildById(L"XuiBtnGameDir", &m_dir_game);
 
    filebrowser_set_root_and_ext(rgui->browser, rgui->info.valid_extensions,
          default_paths.filebrowser_startup_dir);
@@ -660,10 +654,10 @@ HRESULT CRetroArchFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
    char path[PATH_MAX];
    process_input_ret = 0;
 
-   if(hObjPressed == m_list)
+   if(hObjPressed == m_menulist)
    {
-      int index = XuiListGetCurSel(m_list, NULL);
+      int index = XuiListGetCurSel(m_menulist, NULL);
-      wcstombs(str_buffer, (const wchar_t *)XuiListGetText(m_list, index), sizeof(str_buffer));
+      wcstombs(str_buffer, (const wchar_t *)XuiListGetText(m_menulist, index), sizeof(str_buffer));
       if (path_file_exists(rgui->browser->list->elems[index].data))
       {
          snprintf(g_extern.fullpath, sizeof(g_extern.fullpath), "%s\\%s",
@@ -679,13 +673,6 @@ HRESULT CRetroArchFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
          filebrowser_fetch_directory_entries(action);
       }
    }
-   else if (hObjPressed == m_dir_game)
-   {
-      filebrowser_set_root_and_ext(rgui->browser, rgui->info.valid_extensions,
-            g_settings.rgui_browser_directory);
-      uint64_t action = (1ULL << DEVICE_NAV_B);
-      filebrowser_fetch_directory_entries(action);
-   }
 
    bHandled = TRUE;
 
@@ -1219,9 +1206,9 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled
 
 HRESULT CRetroArchShaderBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
 {
-   GetChildById(L"XuiRomList", &m_list);
+   GetChildById(L"XuiMenuList", &m_menulist);
-   GetChildById(L"XuiBackButton1", &m_back);
+   GetChildById(L"XuiTxtTitle", &m_menutitle);
-   GetChildById(L"XuiTxtRomPath", &m_list_path);
+   GetChildById(L"XuiTxtBottom", &m_menutitlebottom);
 
    filebrowser_set_root_and_ext(rgui->browser, "cg", "game:\\media\\shaders");
    uint64_t action = (1ULL << DEVICE_NAV_B);
@@ -1235,14 +1222,14 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand
    char path[PATH_MAX];
    process_input_ret = 0;
 
-   if(hObjPressed == m_list)
+   if(hObjPressed == m_menulist)
    {
-      int index = XuiListGetCurSel(m_list, NULL);
+      int index = XuiListGetCurSel(m_menulist, NULL);
       if (path_file_exists(rgui->browser->list->elems[index].data))
-         wcstombs(str_buffer, (const wchar_t *)XuiListGetText(m_list, index), sizeof(str_buffer));
+         wcstombs(str_buffer, (const wchar_t *)XuiListGetText(m_menulist, index), sizeof(str_buffer));
       else if (rgui->browser->list->elems[index].attr.b)
       {
-         wcstombs(str_buffer, (const wchar_t *)XuiListGetText(m_list, index), sizeof(str_buffer));
+         wcstombs(str_buffer, (const wchar_t *)XuiListGetText(m_menulist, index), sizeof(str_buffer));
          snprintf(path, sizeof(path), "%s\\%s", rgui->browser->current_dir.directory_path, str_buffer);
          filebrowser_set_root_and_ext(rgui->browser, "cg", path);
          uint64_t action = (1ULL << DEVICE_NAV_B);
@@ -1257,9 +1244,9 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand
 
 HRESULT CRetroArchCoreBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
 {
-   GetChildById(L"XuiRomList", &m_list);
+   GetChildById(L"XuiMenuList", &m_menulist);
-   GetChildById(L"XuiBackButton1", &m_back);
+   GetChildById(L"XuiTxtTitle", &m_menutitle);
-   GetChildById(L"XuiTxtRomPath", &m_list_path);
+   GetChildById(L"XuiTxtBottom", &m_menutitlebottom);
 
    filebrowser_set_root_and_ext(rgui->browser, "xex|XEX", "game:");
    uint64_t action = (1ULL << DEVICE_NAV_B);
@@ -1274,10 +1261,10 @@ HRESULT CRetroArchCoreBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
 
    process_input_ret = 0;
 
-   if(hObjPressed == m_list)
+   if(hObjPressed == m_menulist)
    {
-      int index = XuiListGetCurSel(m_list, NULL);
+      int index = XuiListGetCurSel(m_menulist, NULL);
-      wcstombs(str_buffer, (const wchar_t *)XuiListGetText(m_list, index), sizeof(str_buffer));
+      wcstombs(str_buffer, (const wchar_t *)XuiListGetText(m_menulist, index), sizeof(str_buffer));
       if(path_file_exists(rgui->browser->list->elems[index].data))
       {
          snprintf(g_settings.libretro, sizeof(g_settings.libretro), "%s\\%s",

media/360/hd/rarch_controls.xui

@@ -234,6 +234,18 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
@@ -241,7 +253,7 @@
 <Width>208.632019</Width>
 <Height>36.000000</Height>
 <Position>568.000061,432.000000,0.000000</Position>
-<Text>Go back to menu</Text>
+<Text>Go back</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>

media/360/hd/rarch_filebrowser.xui

@@ -5,19 +5,18 @@
 </Properties>
 <XuiScene>
 <Properties>
-<Id>XuiSceneFileBrowser</Id>
+<Id>XuiScene1</Id>
-<Width>1000.000061</Width>
+<Width>824.000061</Width>
-<Height>552.000000</Height>
+<Height>496.000061</Height>
-<Position>144.873901,88.000015,0.000000</Position>
+<Position>225.521820,110.438545,0.000000</Position>
 <ClassOverride>RetroArchFileBrowser</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
 <Id>XuiTxtTitle</Id>
-<Width>111.840027</Width>
+<Width>721.056030</Width>
 <Height>40.000000</Height>
-<Position>28.893612,12.519989,0.000000</Position>
+<Position>43.581604,21.159988,0.000000</Position>
-<Text>Filebrowser</Text>
 <TextColor>0xff0f0f0f</TextColor>
 <DropShadowColor>0x800f0f0f</DropShadowColor>
 <Font>Arial Unicode MS</Font>
@@ -26,12 +25,10 @@
 </XuiText>
 <XuiCommonList>
 <Properties>
-<Id>XuiRomList</Id>
+<Id>XuiMenuList</Id>
-<Width>945.200073</Width>
+<Width>723.120056</Width>
-<Height>376.000031</Height>
+<Height>367.040009</Height>
-<Position>22.799980,88.000000,0.000000</Position>
+<Position>44.880005,64.959991,0.000000</Position>
-<NavUp>XuiBtnGameDir</NavUp>
-<NavDown>XuiBtnGameDir</NavDown>
 </Properties>
 <XuiListItem>
 <Properties>
@@ -165,47 +162,120 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
-<Id>XuiBackButton1</Id>
+<Id>XuiBackButton</Id>
-<Width>204.599976</Width>
+<Width>208.632019</Width>
 <Height>36.000000</Height>
-<Position>355.115234,484.396851,0.000000</Position>
+<Position>568.000061,432.000000,0.000000</Position>
 <Text>Go back to menu</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>
-<XuiText>
-<Properties>
-<Id>XuiTxtRomPath</Id>
-<Width>166.559998</Width>
-<Height>28.480011</Height>
-<Position>96.000000,42.480011,0.000000</Position>
-<TextColor>0xff0f0f0f</TextColor>
-<DropShadowColor>0x800f0f0f</DropShadowColor>
-</Properties>
-</XuiText>
 <XuiLabel>
 <Properties>
-<Id>XuiLblPath</Id>
+<Id>XuiTxtBottom</Id>
-<Width>72.880005</Width>
+<Width>124.000000</Width>
 <Height>28.000000</Height>
-<Position>26.000000,43.000000,0.000000</Position>
+<Position>51.543991,434.792023,0.000000</Position>
-<Text>PATH:</Text>
 </Properties>
 </XuiLabel>
-<XuiButton>
-<Properties>
-<Id>XuiBtnGameDir</Id>
-<Width>115.640007</Width>
-<Height>38.000000</Height>
-<Position>31.999985,480.000061,0.000000</Position>
-<NavRight>XuiBtnCacheDir</NavRight>
-<NavUp>XuiRomList</NavUp>
-<NavDown>XuiRomList</NavDown>
-<Text>game:</Text>
-</Properties>
-</XuiButton>
 </XuiScene>
 </XuiCanvas>

media/360/hd/rarch_libretrocore_browser.xui

@@ -5,19 +5,18 @@
 </Properties>
 <XuiScene>
 <Properties>
-<Id>XuiSceneCoreFileBrowser</Id>
+<Id>XuiScene1</Id>
-<Width>920.000122</Width>
+<Width>824.000061</Width>
-<Height>552.000000</Height>
+<Height>496.000061</Height>
-<Position>176.000015,88.000015,0.000000</Position>
+<Position>225.521820,110.438545,0.000000</Position>
 <ClassOverride>RetroArchCoreBrowser</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
 <Id>XuiTxtTitle</Id>
-<Width>326.640015</Width>
+<Width>721.056030</Width>
 <Height>40.000000</Height>
-<Position>28.893612,12.519989,0.000000</Position>
+<Position>43.581604,21.159988,0.000000</Position>
-<Text>Filebrowser - Select a libretro core</Text>
 <TextColor>0xff0f0f0f</TextColor>
 <DropShadowColor>0x800f0f0f</DropShadowColor>
 <Font>Arial Unicode MS</Font>
@@ -26,10 +25,10 @@
 </XuiText>
 <XuiCommonList>
 <Properties>
-<Id>XuiRomList</Id>
+<Id>XuiMenuList</Id>
-<Width>857.200195</Width>
+<Width>723.120056</Width>
-<Height>406.400024</Height>
+<Height>367.040009</Height>
-<Position>22.799980,81.600006,0.000000</Position>
+<Position>44.880005,64.959991,0.000000</Position>
 </Properties>
 <XuiListItem>
 <Properties>
@@ -163,34 +162,107 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
-<Id>XuiBackButton1</Id>
+<Id>XuiBackButton</Id>
-<Width>219.000000</Width>
+<Width>208.632019</Width>
 <Height>36.000000</Height>
-<Position>680.000061,504.000061,0.000000</Position>
+<Position>568.000061,432.000000,0.000000</Position>
 <Text>Go back to menu</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>
-<XuiText>
-<Properties>
-<Id>XuiTxtRomPath</Id>
-<Width>166.559998</Width>
-<Height>28.480011</Height>
-<Position>96.000000,42.480011,0.000000</Position>
-<TextColor>0xff0f0f0f</TextColor>
-<DropShadowColor>0x800f0f0f</DropShadowColor>
-</Properties>
-</XuiText>
 <XuiLabel>
 <Properties>
-<Id>XuiLblPath</Id>
+<Id>XuiTxtBottom</Id>
-<Width>72.880005</Width>
+<Width>124.000000</Width>
 <Height>28.000000</Height>
-<Position>26.000000,43.000000,0.000000</Position>
+<Position>51.543991,434.792023,0.000000</Position>
-<Text>PATH:</Text>
 </Properties>
 </XuiLabel>
 </XuiScene>

media/360/hd/rarch_quickmenu.xui

@@ -210,6 +210,18 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
@@ -217,7 +229,7 @@
 <Width>208.632019</Width>
 <Height>36.000000</Height>
 <Position>568.000061,432.000000,0.000000</Position>
-<Text>Go back to menu</Text>
+<Text>Go back</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>

media/360/hd/rarch_settings.xui

@@ -210,6 +210,18 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
@@ -217,7 +229,7 @@
 <Width>208.632019</Width>
 <Height>36.000000</Height>
 <Position>568.000061,432.000000,0.000000</Position>
-<Text>Go back to menu</Text>
+<Text>Go back</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>

media/360/hd/rarch_shader_browser.xui

@@ -5,19 +5,18 @@
 </Properties>
 <XuiScene>
 <Properties>
-<Id>XuiSceneCoreFileBrowser</Id>
+<Id>XuiScene1</Id>
-<Width>920.000122</Width>
+<Width>824.000061</Width>
-<Height>552.000000</Height>
+<Height>496.000061</Height>
-<Position>176.000015,88.000015,0.000000</Position>
+<Position>225.521820,110.438545,0.000000</Position>
 <ClassOverride>RetroArchShaderBrowser</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
 <Id>XuiTxtTitle</Id>
-<Width>326.640015</Width>
+<Width>721.056030</Width>
 <Height>40.000000</Height>
-<Position>28.893612,12.519989,0.000000</Position>
+<Position>43.581604,21.159988,0.000000</Position>
-<Text>Shader selection - Select a shader</Text>
 <TextColor>0xff0f0f0f</TextColor>
 <DropShadowColor>0x800f0f0f</DropShadowColor>
 <Font>Arial Unicode MS</Font>
@@ -26,10 +25,10 @@
 </XuiText>
 <XuiCommonList>
 <Properties>
-<Id>XuiRomList</Id>
+<Id>XuiMenuList</Id>
-<Width>857.200195</Width>
+<Width>723.120056</Width>
-<Height>406.400024</Height>
+<Height>367.040009</Height>
-<Position>22.799980,81.600006,0.000000</Position>
+<Position>44.880005,64.959991,0.000000</Position>
 </Properties>
 <XuiListItem>
 <Properties>
@@ -199,34 +198,59 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
-<Id>XuiBackButton1</Id>
+<Id>XuiBackButton</Id>
-<Width>219.000000</Width>
+<Width>208.632019</Width>
 <Height>36.000000</Height>
-<Position>680.000061,504.000061,0.000000</Position>
+<Position>568.000061,432.000000,0.000000</Position>
 <Text>Go back to menu</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>
-<XuiText>
-<Properties>
-<Id>XuiTxtRomPath</Id>
-<Width>512.000122</Width>
-<Height>28.480011</Height>
-<Position>96.000000,42.480011,0.000000</Position>
-<TextColor>0xff0f0f0f</TextColor>
-<DropShadowColor>0x800f0f0f</DropShadowColor>
-</Properties>
-</XuiText>
 <XuiLabel>
 <Properties>
-<Id>XuiLblPath</Id>
+<Id>XuiTxtBottom</Id>
-<Width>72.880005</Width>
+<Width>124.000000</Width>
 <Height>28.000000</Height>
-<Position>26.000000,43.000000,0.000000</Position>
+<Position>51.543991,434.792023,0.000000</Position>
-<Text>PATH:</Text>
 </Properties>
 </XuiLabel>
 </XuiScene>

media/360/sd/rarch_controls.xui

@@ -186,6 +186,18 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
@@ -193,7 +205,7 @@
 <Width>208.632019</Width>
 <Height>36.000000</Height>
 <Position>356.670013,309.000000,0.000000</Position>
-<Text>Go back to menu</Text>
+<Text>Go back</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>

media/360/sd/rarch_filebrowser.xui

@@ -5,19 +5,18 @@
 </Properties>
 <XuiScene>
 <Properties>
-<Id>XuiSceneFileBrowser</Id>
+<Id>XuiScene1</Id>
-<Width>575.888062</Width>
+<Width>584.528076</Width>
-<Height>336.017609</Height>
+<Height>363.320007</Height>
-<Position>32.029999,48.040001,0.000000</Position>
+<Position>32.029999,76.040001,0.000000</Position>
 <ClassOverride>RetroArchFileBrowser</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
 <Id>XuiTxtTitle</Id>
-<Width>111.840027</Width>
+<Width>121.056023</Width>
 <Height>40.000000</Height>
-<Position>28.893612,12.519989,0.000000</Position>
+<Position>43.581604,21.159988,0.000000</Position>
-<Text>Filebrowser</Text>
 <TextColor>0xff0f0f0f</TextColor>
 <DropShadowColor>0x800f0f0f</DropShadowColor>
 <Font>Arial Unicode MS</Font>
@@ -26,12 +25,10 @@
 </XuiText>
 <XuiCommonList>
 <Properties>
-<Id>XuiRomList</Id>
+<Id>XuiMenuList</Id>
-<Width>536.582458</Width>
+<Width>492.000000</Width>
-<Height>170.800018</Height>
+<Height>232.720001</Height>
-<Position>22.799980,81.600006,0.000000</Position>
+<Position>44.880005,48.959991,0.000000</Position>
-<NavUp>XuiBtnGameDir</NavUp>
-<NavDown>XuiBtnGameDir</NavDown>
 </Properties>
 <XuiListItem>
 <Properties>
@@ -153,47 +150,108 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
-<Id>XuiBackButton1</Id>
+<Id>XuiBackButton</Id>
-<Width>204.599976</Width>
+<Width>208.632019</Width>
 <Height>36.000000</Height>
-<Position>353.115234,281.396820,0.000000</Position>
+<Position>356.670013,309.000000,0.000000</Position>
-<Text>Go back to menu</Text>
+<Text>Go back</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>
-<XuiText>
-<Properties>
-<Id>XuiTxtRomPath</Id>
-<Width>166.559998</Width>
-<Height>28.480011</Height>
-<Position>96.000000,42.480011,0.000000</Position>
-<TextColor>0xff0f0f0f</TextColor>
-<DropShadowColor>0x800f0f0f</DropShadowColor>
-</Properties>
-</XuiText>
 <XuiLabel>
 <Properties>
-<Id>XuiLblPath</Id>
+<Id>XuiTxtBottom</Id>
-<Width>72.880005</Width>
+<Width>124.000000</Width>
 <Height>28.000000</Height>
-<Position>26.000000,43.000000,0.000000</Position>
+<Position>12.544006,313.792023,0.000000</Position>
-<Text>PATH:</Text>
 </Properties>
 </XuiLabel>
-<XuiButton>
-<Properties>
-<Id>XuiBtnGameDir</Id>
-<Width>115.640007</Width>
-<Height>38.000000</Height>
-<Position>30.000000,277.000000,0.000000</Position>
-<NavRight>XuiBtnCacheDir</NavRight>
-<NavUp>XuiRomList</NavUp>
-<NavDown>XuiRomList</NavDown>
-<Text>game:</Text>
-</Properties>
-</XuiButton>
 </XuiScene>
 </XuiCanvas>

media/360/sd/rarch_libretrocore_browser.xui

@@ -5,19 +5,18 @@
 </Properties>
 <XuiScene>
 <Properties>
-<Id>XuiSceneCoreFileBrowser</Id>
+<Id>XuiScene1</Id>
-<Width>575.888062</Width>
+<Width>584.528076</Width>
-<Height>336.017609</Height>
+<Height>363.320007</Height>
-<Position>32.029999,48.040001,0.000000</Position>
+<Position>32.029999,76.040001,0.000000</Position>
 <ClassOverride>RetroArchCoreBrowser</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
 <Id>XuiTxtTitle</Id>
-<Width>326.640015</Width>
+<Width>121.056023</Width>
 <Height>40.000000</Height>
-<Position>28.893612,12.519989,0.000000</Position>
+<Position>43.581604,21.159988,0.000000</Position>
-<Text>Filebrowser - Select a libretro core</Text>
 <TextColor>0xff0f0f0f</TextColor>
 <DropShadowColor>0x800f0f0f</DropShadowColor>
 <Font>Arial Unicode MS</Font>
@@ -26,10 +25,10 @@
 </XuiText>
 <XuiCommonList>
 <Properties>
-<Id>XuiRomList</Id>
+<Id>XuiMenuList</Id>
-<Width>536.582458</Width>
+<Width>492.000000</Width>
-<Height>170.800018</Height>
+<Height>232.720001</Height>
-<Position>22.799980,81.600006,0.000000</Position>
+<Position>44.880005,48.959991,0.000000</Position>
 </Properties>
 <XuiListItem>
 <Properties>
@@ -151,34 +150,95 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
-<Id>XuiBackButton1</Id>
+<Id>XuiBackButton</Id>
-<Width>219.000000</Width>
+<Width>208.632019</Width>
 <Height>36.000000</Height>
-<Position>338.715210,281.396820,0.000000</Position>
+<Position>356.670013,309.000000,0.000000</Position>
-<Text>Go back to menu</Text>
+<Text>Go back</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>
-<XuiText>
-<Properties>
-<Id>XuiTxtRomPath</Id>
-<Width>166.559998</Width>
-<Height>28.480011</Height>
-<Position>96.000000,42.480011,0.000000</Position>
-<TextColor>0xff0f0f0f</TextColor>
-<DropShadowColor>0x800f0f0f</DropShadowColor>
-</Properties>
-</XuiText>
 <XuiLabel>
 <Properties>
-<Id>XuiLblPath</Id>
+<Id>XuiTxtBottom</Id>
-<Width>72.880005</Width>
+<Width>124.000000</Width>
 <Height>28.000000</Height>
-<Position>26.000000,43.000000,0.000000</Position>
+<Position>12.544006,313.792023,0.000000</Position>
-<Text>PATH:</Text>
 </Properties>
 </XuiLabel>
 </XuiScene>

media/360/sd/rarch_main.xui

@@ -186,6 +186,18 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
@@ -193,7 +205,7 @@
 <Width>208.632019</Width>
 <Height>36.000000</Height>
 <Position>356.670013,309.000000,0.000000</Position>
-<Text>Go back to menu</Text>
+<Text>Go back</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>

media/360/sd/rarch_quickmenu.xui

@@ -174,6 +174,18 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
@@ -181,7 +193,7 @@
 <Width>208.632019</Width>
 <Height>36.000000</Height>
 <Position>356.670013,309.000000,0.000000</Position>
-<Text>Go back to menu</Text>
+<Text>Go back</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>

media/360/sd/rarch_settings.xui

@@ -174,6 +174,18 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
@@ -181,7 +193,7 @@
 <Width>208.632019</Width>
 <Height>36.000000</Height>
 <Position>356.670013,309.000000,0.000000</Position>
-<Text>Go back to menu</Text>
+<Text>Go back</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>

media/360/sd/rarch_shader_browser.xui

@@ -5,19 +5,18 @@
 </Properties>
 <XuiScene>
 <Properties>
-<Id>XuiSceneCoreFileBrowser</Id>
+<Id>XuiScene1</Id>
-<Width>575.888062</Width>
+<Width>584.528076</Width>
-<Height>336.017609</Height>
+<Height>363.320007</Height>
-<Position>32.029999,48.040001,0.000000</Position>
+<Position>32.029999,76.040001,0.000000</Position>
 <ClassOverride>RetroArchShaderBrowser</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
 <Id>XuiTxtTitle</Id>
-<Width>326.640015</Width>
+<Width>121.056023</Width>
 <Height>40.000000</Height>
-<Position>28.893612,12.519989,0.000000</Position>
+<Position>43.581604,21.159988,0.000000</Position>
-<Text>Shader selection - Select a shader</Text>
 <TextColor>0xff0f0f0f</TextColor>
 <DropShadowColor>0x800f0f0f</DropShadowColor>
 <Font>Arial Unicode MS</Font>
@@ -26,10 +25,10 @@
 </XuiText>
 <XuiCommonList>
 <Properties>
-<Id>XuiRomList</Id>
+<Id>XuiMenuList</Id>
-<Width>536.582458</Width>
+<Width>492.000000</Width>
-<Height>170.800018</Height>
+<Height>232.720001</Height>
-<Position>22.799980,81.600006,0.000000</Position>
+<Position>44.880005,48.959991,0.000000</Position>
 </Properties>
 <XuiListItem>
 <Properties>
@@ -187,34 +186,47 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
-<Id>XuiBackButton1</Id>
+<Id>XuiBackButton</Id>
-<Width>219.000000</Width>
+<Width>208.632019</Width>
 <Height>36.000000</Height>
-<Position>338.715210,281.396820,0.000000</Position>
+<Position>356.670013,309.000000,0.000000</Position>
-<Text>Go back to menu</Text>
+<Text>Go back</Text>
 <PressKey>22593</PressKey>
 </Properties>
 </XuiBackButton>
-<XuiText>
-<Properties>
-<Id>XuiTxtRomPath</Id>
-<Width>406.004150</Width>
-<Height>28.480011</Height>
-<Position>96.000000,42.480011,0.000000</Position>
-<TextColor>0xff0f0f0f</TextColor>
-<DropShadowColor>0x800f0f0f</DropShadowColor>
-</Properties>
-</XuiText>
 <XuiLabel>
 <Properties>
-<Id>XuiLblPath</Id>
+<Id>XuiTxtBottom</Id>
-<Width>72.880005</Width>
+<Width>124.000000</Width>
 <Height>28.000000</Height>
-<Position>26.000000,43.000000,0.000000</Position>
+<Position>12.544006,313.792023,0.000000</Position>
-<Text>PATH:</Text>
 </Properties>
 </XuiLabel>
 </XuiScene>