(xbox 1) Have most menus work on xbox 1 - font placement needs
work
This commit is contained in:
twinaphex
parent
b40dc9e1a7
commit
ed0bda6869
|
|
@ -1726,8 +1726,9 @@ static void select_setting(item *items, menu *current_menu, uint64_t input)
|
|||
producesettingentry(current_menu, items, current_menu->selected, input);
|
||||
|
||||
display_menubar(current_menu);
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
|
||||
#endif
|
||||
|
||||
for(i = current_menu->first_setting; i < current_menu->max_settings; i++)
|
||||
{
|
||||
|
|
@ -1735,7 +1736,9 @@ static void select_setting(item *items, menu *current_menu, uint64_t input)
|
|||
{
|
||||
render_msg_place_func(items[i].text_xpos, items[i].text_ypos, FONT_SIZE, current_menu->selected == items[i].enum_id ? YELLOW : items[i].item_color, items[i].text);
|
||||
render_msg_place_func(x_position_center, items[i].text_ypos, FONT_SIZE, items[i].text_color, items[i].setting_text);
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1745,7 +1748,9 @@ static void select_setting(item *items, menu *current_menu, uint64_t input)
|
|||
render_msg_place_func(x_position, comment_two_y_position, FONT_SIZE, YELLOW, msg);
|
||||
snprintf(msg, sizeof(msg), "[%s] - default | [%s]/[%s] - go back", rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_START), rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_L), rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_A));
|
||||
render_msg_place_func(x_position, comment_two_y_position + 0.04f, FONT_SIZE, YELLOW, msg);
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
}
|
||||
|
||||
static void menu_romselect_iterate(filebrowser_t *filebrowser, item *items, menu_romselect_action_t action)
|
||||
|
|
@ -1913,7 +1918,9 @@ static void ingame_menu_resize(item *items, menu *current_menu, uint64_t input)
|
|||
render_msg_place_func (x_position, y_position+(y_position_increment*5), font_size, LIGHTBLUE, msg);
|
||||
render_msg_place_func (x_position_center, y_position+(y_position_increment*5), font_size, LIGHTBLUE, "- Decrease Viewport X");
|
||||
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
|
||||
snprintf(msg, sizeof(msg), "[%s] or [%s]", rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_RIGHT), rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_RIGHT));
|
||||
render_msg_place_func (x_position, y_position+(y_position_increment*6), font_size, LIGHTBLUE, msg);
|
||||
|
|
@ -1923,7 +1930,9 @@ static void ingame_menu_resize(item *items, menu *current_menu, uint64_t input)
|
|||
render_msg_place_func (x_position, y_position+(y_position_increment*7), font_size, LIGHTBLUE, msg);
|
||||
render_msg_place_func (x_position_center, y_position+(y_position_increment*7), font_size, LIGHTBLUE, "- Increase Viewport Y");
|
||||
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
|
||||
snprintf(msg, sizeof(msg), "[%s] or [%s]", rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_DOWN), rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_DOWN));
|
||||
render_msg_place_func (x_position, y_position+(y_position_increment*8), font_size, LIGHTBLUE, msg);
|
||||
|
|
@ -1933,7 +1942,9 @@ static void ingame_menu_resize(item *items, menu *current_menu, uint64_t input)
|
|||
render_msg_place_func (x_position, y_position+(y_position_increment*9), font_size, LIGHTBLUE, msg);
|
||||
render_msg_place_func (x_position_center, y_position+(y_position_increment*9), font_size, LIGHTBLUE, "- Decrease Viewport Width");
|
||||
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
|
||||
snprintf(msg, sizeof(msg), "[%s] or [%s]", rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_R), rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_RIGHT));
|
||||
render_msg_place_func (x_position, y_position+(y_position_increment*10), font_size, LIGHTBLUE, msg);
|
||||
|
|
@ -1943,7 +1954,9 @@ static void ingame_menu_resize(item *items, menu *current_menu, uint64_t input)
|
|||
render_msg_place_func (x_position, y_position+(y_position_increment*11), font_size, LIGHTBLUE, msg);
|
||||
render_msg_place_func (x_position_center, y_position+(y_position_increment*11), font_size, LIGHTBLUE, "- Increase Viewport Height");
|
||||
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
|
||||
snprintf(msg, sizeof(msg), "[%s] or [%s]", rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_R2), rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_DOWN));
|
||||
render_msg_place_func (x_position, y_position+(y_position_increment*12), font_size, LIGHTBLUE, msg);
|
||||
|
|
@ -1961,11 +1974,15 @@ static void ingame_menu_resize(item *items, menu *current_menu, uint64_t input)
|
|||
render_msg_place_func (x_position, y_position+(y_position_increment*15), font_size, LIGHTBLUE, msg);
|
||||
render_msg_place_func (x_position_center, y_position+(y_position_increment*15), font_size, LIGHTBLUE, "- Return to Ingame Menu");
|
||||
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
|
||||
snprintf(msg, sizeof(msg), "Allows you to resize the screen by moving around the two analog sticks.\nPress [%s] to reset to defaults, and [%s] to go back.", rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_X), rarch_input_find_platform_key_label(1 << RETRO_DEVICE_ID_JOYPAD_A));
|
||||
render_msg_place_func (x_position, comment_y_position, font_size, LIGHTBLUE, msg);
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2166,7 +2183,9 @@ static void ingame_menu(item *items, menu *current_menu, uint64_t input)
|
|||
|
||||
rarch_settings_create_menu_item_label(strw_buffer, S_LBL_SAVE_STATE_SLOT, sizeof(strw_buffer));
|
||||
render_msg_place_func(x_position, y_position+(y_position_increment*MENU_ITEM_SAVE_STATE), font_size, MENU_ITEM_SELECTED(MENU_ITEM_SAVE_STATE), strw_buffer);
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
|
||||
rarch_settings_create_menu_item_label(strw_buffer, S_LBL_ASPECT_RATIO, sizeof(strw_buffer));
|
||||
render_msg_place_func(x_position, (y_position+(y_position_increment*MENU_ITEM_KEEP_ASPECT_RATIO)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_KEEP_ASPECT_RATIO), strw_buffer);
|
||||
|
|
@ -2176,7 +2195,9 @@ static void ingame_menu(item *items, menu *current_menu, uint64_t input)
|
|||
|
||||
rarch_settings_create_menu_item_label(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer));
|
||||
render_msg_place_func (x_position, (y_position+(y_position_increment*MENU_ITEM_ORIENTATION)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_ORIENTATION), strw_buffer);
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_FBO
|
||||
rarch_settings_create_menu_item_label(strw_buffer, S_LBL_SCALE_FACTOR, sizeof(strw_buffer));
|
||||
|
|
@ -2190,28 +2211,40 @@ static void ingame_menu(item *items, menu *current_menu, uint64_t input)
|
|||
|
||||
render_msg_place_func(x_position, (y_position+(y_position_increment*MENU_ITEM_SCREENSHOT_MODE)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_SCREENSHOT_MODE), "Screenshot Mode");
|
||||
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
|
||||
render_msg_place_func(x_position, (y_position+(y_position_increment*MENU_ITEM_RESET)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RESET), "Reset");
|
||||
|
||||
render_msg_place_func(x_position, (y_position+(y_position_increment*MENU_ITEM_RETURN_TO_GAME)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_GAME), "Return to Game");
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
|
||||
render_msg_place_func(x_position, (y_position+(y_position_increment*MENU_ITEM_RETURN_TO_MENU)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_MENU), "Return to Menu");
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
|
||||
render_msg_place_func(x_position, (y_position+(y_position_increment*MENU_ITEM_CHANGE_LIBRETRO)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_CHANGE_LIBRETRO), "Change libretro core");
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_MULTIMAN
|
||||
render_msg_place_func(x_position, (y_position+(y_position_increment*MENU_ITEM_RETURN_TO_MULTIMAN)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_MULTIMAN), "Return to multiMAN");
|
||||
#endif
|
||||
|
||||
render_msg_place_func(x_position, (y_position+(y_position_increment*MENU_ITEM_RETURN_TO_DASHBOARD)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_DASHBOARD), "Return to XMB");
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
|
||||
render_msg_place_func(x_position, comment_y_position, font_size, LIGHTBLUE, comment);
|
||||
#ifdef __CELLOS_LV2__
|
||||
render_msg_post_func();
|
||||
#endif
|
||||
}
|
||||
|
||||
void menu_init (void)
|
||||
|
|
|
|||
|
|
@ -165,11 +165,13 @@ static void xdk_d3d_set_rotation(void * data, unsigned orientation)
|
|||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
D3DXMATRIX p_out;
|
||||
D3DXMatrixIdentity(&p_out);
|
||||
d3d->d3d_render_device->SetTransform(D3DTS_PROJECTION, &p_out);
|
||||
|
||||
d3d->should_resize = TRUE;
|
||||
*/
|
||||
}
|
||||
|
||||
static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **input, void **input_data)
|
||||
|
|
|
|||
Loading…
Reference in New Issue