mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-04 12:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Make position values interchangeable between platform ports

Browse Source
This commit is contained in:
Twinaphex 2012-08-03 03:46:01 +02:00
parent 670da875e7
commit c96608eadc
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ps3/frontend/menu.c
View File

@ -364,7 +364,7 @@ static void menu_stack_refresh (item *items, menu *current_menu)
int page, i, j; int page, i, j;
float increment; float increment;
float increment_step = 0.03f; float increment_step = 0.03f;
float x_position = 0.09f; float x_position = POSITION_X;
page = 0; page = 0;
j = 0; j = 0;
@ -557,7 +557,7 @@ static void display_menubar(menu *current_menu)
filebrowser_t *fb = &browser; filebrowser_t *fb = &browser;
char current_path[256], rarch_version[128]; char current_path[256], rarch_version[128];
float x_position = 0.09f; float x_position = POSITION_X;
float font_size = 0.91f; float font_size = 0.91f;
snprintf(rarch_version, sizeof(rarch_version), "v%s", PACKAGE_VERSION); snprintf(rarch_version, sizeof(rarch_version), "v%s", PACKAGE_VERSION);
@ -705,7 +705,7 @@ static void select_file(item *items, menu *current_menu, uint64_t input)
bool ret = true; bool ret = true;
float x_position = 0.09f; float x_position = POSITION_X;
float comment_y_position = 0.83f; float comment_y_position = 0.83f;
float comment_two_y_position = 0.91f; float comment_two_y_position = 0.91f;
float font_size = 0.91f; float font_size = 0.91f;
@ -813,7 +813,7 @@ static void select_directory(item *items, menu *current_menu, uint64_t input)
bool ret = true; bool ret = true;
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
float x_position = 0.09f; float x_position = POSITION_X;
float comment_y_position = 0.83f; float comment_y_position = 0.83f;
float comment_two_y_position = 0.91f; float comment_two_y_position = 0.91f;
float font_size = 0.91f; float font_size = 0.91f;
@ -1619,7 +1619,7 @@ static void select_setting(item *items, menu *current_menu, uint64_t input)
char msg[256]; char msg[256];
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
float x_position = 0.09f; float x_position = POSITION_X;
float x_position_center = 0.5f; float x_position_center = 0.5f;
float comment_y_position = 0.83f; float comment_y_position = 0.83f;
float comment_two_y_position = 0.91f; float comment_two_y_position = 0.91f;
@ -1638,7 +1638,7 @@ static void select_setting(item *items, menu *current_menu, uint64_t input)
action = SETTINGS_ACTION_UP; action = SETTINGS_ACTION_UP;
if(action != SETTINGS_ACTION_NOOP) if(action != SETTINGS_ACTION_NOOP)
settings_iterate(current_menu, items, action); settings_iterate(current_menu, items, action);
producesettingentry(current_menu, items, current_menu->selected, input); producesettingentry(current_menu, items, current_menu->selected, input);
@ -1693,7 +1693,7 @@ static void select_rom(item *items, menu *current_menu, uint64_t input)
{ {
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
float x_position = 0.09f; float x_position = POSITION_X;
float comment_y_position = 0.83f; float comment_y_position = 0.83f;
float font_size = 0.91f; float font_size = 0.91f;
float comment_two_y_position = 0.91f; float comment_two_y_position = 0.91f;
@ -1741,7 +1741,7 @@ static void ingame_menu_resize(item *items, menu *current_menu, uint64_t input)
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
float x_position = 0.09f; float x_position = POSITION_X;
float x_position_center = 0.5f; float x_position_center = 0.5f;
float font_size = 0.91f; float font_size = 0.91f;
@ -1905,7 +1905,7 @@ static void ingame_menu(item *items, menu *current_menu, uint64_t input)
static unsigned menuitem_colors[MENU_ITEM_LAST]; static unsigned menuitem_colors[MENU_ITEM_LAST];
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
float x_position = 0.09f; float x_position = POSITION_X;
float y_position = 0.16f; float y_position = 0.16f;
float comment_y_position = 0.83f; float comment_y_position = 0.83f;
float font_size = 0.91f; float font_size = 0.91f;
@ -2316,8 +2316,8 @@ void menu_loop(void)
break; break;
} }
float x_position = 0.09f; float x_position = POSITION_X;
float starting_y_position = 0.10f; float starting_y_position = POSITION_Y_START;
float y_position_increment = 0.035f; float y_position_increment = 0.035f;
switch(current_menu->category_id) switch(current_menu->category_id)

6
ps3/frontend/menu.h
View File

@ -25,6 +25,9 @@
#define render_msg_pre_func() gl_render_msg_pre(DEVICE_PTR) #define render_msg_pre_func() gl_render_msg_pre(DEVICE_PTR)
#define render_msg_place_func(xpos, ypos, scale, color, msg) gl_render_msg_place(xpos, ypos, scale, color, msg) #define render_msg_place_func(xpos, ypos, scale, color, msg) gl_render_msg_place(xpos, ypos, scale, color, msg)
#define render_msg_post_func() gl_render_msg_post(DEVICE_PTR) #define render_msg_post_func() gl_render_msg_post(DEVICE_PTR)
#define POSITION_X 0.09f
#define POSITION_Y_START 0.10f
#elif defined(_XBOX1) #elif defined(_XBOX1)
#define DEVICE_CAST xdk_d3d_video_t* #define DEVICE_CAST xdk_d3d_video_t*
#define input_ptr input_xinput #define input_ptr input_xinput
@ -33,6 +36,9 @@
#define render_msg_pre_func() xfonts_render_msg_pre(DEVICE_PTR) #define render_msg_pre_func() xfonts_render_msg_pre(DEVICE_PTR)
#define render_msg_place_func(xpos, ypos, scale, color, msg) xfonts_render_msg_place(DEVICE_PTR, xpos, ypos, scale, msg) #define render_msg_place_func(xpos, ypos, scale, color, msg) xfonts_render_msg_place(DEVICE_PTR, xpos, ypos, scale, msg)
#define render_msg_post_func() xfonts_render_msg_post(DEVICE_PTR) #define render_msg_post_func() xfonts_render_msg_post(DEVICE_PTR)
#define POSITION_X m_menuMainRomListPos_x
#define POSITION_Y_START m_menuMainRomListPos_y
#endif #endif
typedef struct typedef struct

10
xbox1/frontend/menu.cpp
View File

@ -349,7 +349,7 @@ static void menu_stack_refresh (item *items, menu *current_menu)
int page, i, j; int page, i, j;
float increment; float increment;
float increment_step = 0.03f; float increment_step = 0.03f;
float x_position = 0.09f; float x_position = POSITION_X;
page = 0; page = 0;
j = 0; j = 0;
@ -539,8 +539,8 @@ static void display_menubar(menu *current_menu)
filebrowser_t *fb = &browser; filebrowser_t *fb = &browser;
char current_path[256], rarch_version[128]; char current_path[256], rarch_version[128];
float x_position = m_menuMainRomListPos_x; float x_position = POSITION_X;
float current_y_position = m_menuMainRomListPos_y; float current_y_position = POSITION_Y_START;
float font_size = m_menuMainRomListPos_y; float font_size = m_menuMainRomListPos_y;
snprintf(rarch_version, sizeof(rarch_version), "v%s", PACKAGE_VERSION); snprintf(rarch_version, sizeof(rarch_version), "v%s", PACKAGE_VERSION);
@ -942,8 +942,8 @@ void menu_loop(void)
break; break;
} }
float x_position = m_menuMainRomListPos_x; float x_position = POSITION_X;
float starting_y_position = m_menuMainRomListPos_y; float starting_y_position = POSITION_Y_START;
float y_position_increment = 20; float y_position_increment = 20;
switch(current_menu->category_id) switch(current_menu->category_id)