ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2016-09-15 18:50:33 +02:00
parent c64cc373af
commit bb5543c2a1
5 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/drivers/materialui.c
View File

@ -845,7 +845,6 @@ static void mui_frame(void *data)
unsigned header_height = 0; unsigned header_height = 0;
size_t selection = 0; size_t selection = 0;
size_t title_margin = 0; size_t title_margin = 0;
bool display_kb = false;
mui_handle_t *mui = (mui_handle_t*)data; mui_handle_t *mui = (mui_handle_t*)data;
uint64_t *frame_count = video_driver_get_frame_count_ptr(); uint64_t *frame_count = video_driver_get_frame_count_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -1204,9 +1203,7 @@ static void mui_frame(void *data)
mui_draw_scrollbar(mui, width, height, &grey_bg[0]); mui_draw_scrollbar(mui, width, height, &grey_bg[0]);
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_DISPLAY, &display_kb); if (menu_input_dialog_get_display_kb())
if (display_kb)
{ {
const char *str = NULL, *label = NULL; const char *str = NULL, *label = NULL;
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_BUFF_PTR, &str); menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_BUFF_PTR, &str);

6
menu/drivers/rgui.c
View File

@ -383,11 +383,11 @@ static void rgui_render(void *data)
{ {
menu_animation_ctx_ticker_t ticker; menu_animation_ctx_ticker_t ticker;
unsigned x, y; unsigned x, y;
bool display_kb, msg_force;
uint16_t hover_color, normal_color; uint16_t hover_color, normal_color;
size_t i, end, fb_pitch, old_start; size_t i, end, fb_pitch, old_start;
unsigned fb_width, fb_height; unsigned fb_width, fb_height;
int bottom; int bottom;
bool msg_force = false;
uint64_t *frame_count = NULL; uint64_t *frame_count = NULL;
char title[256] = {0}; char title[256] = {0};
char title_buf[256] = {0}; char title_buf[256] = {0};
@ -609,9 +609,7 @@ static void rgui_render(void *data)
entry_selected ? hover_color : normal_color); entry_selected ? hover_color : normal_color);
} }
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_DISPLAY, &display_kb); if (menu_input_dialog_get_display_kb())
if (display_kb)
{ {
const char *str = NULL; const char *str = NULL;
const char *label = NULL; const char *label = NULL;

5
menu/drivers/xmb.c
View File

@ -2152,7 +2152,6 @@ static void xmb_frame(void *data)
char msg[PATH_MAX_LENGTH] = {0}; char msg[PATH_MAX_LENGTH] = {0};
char title_msg[256] = {0}; char title_msg[256] = {0};
char title_truncated[256] = {0}; char title_truncated[256] = {0};
bool display_kb = false;
bool render_background = false; bool render_background = false;
file_list_t *selection_buf = NULL; file_list_t *selection_buf = NULL;
file_list_t *menu_stack = NULL; file_list_t *menu_stack = NULL;
@ -2365,9 +2364,7 @@ static void xmb_frame(void *data)
menu_display_font_flush_block(); menu_display_font_flush_block();
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_DISPLAY, &display_kb); if (menu_input_dialog_get_display_kb())
if (display_kb)
{ {
const char *str = NULL; const char *str = NULL;
const char *label = NULL; const char *label = NULL;

6
menu/menu_input.c
View File

@ -693,12 +693,6 @@ bool menu_input_ctl(enum menu_input_ctl_state state, void *data)
case MENU_INPUT_CTL_UNSET_POINTER_DRAGGED: case MENU_INPUT_CTL_UNSET_POINTER_DRAGGED:
pointer_dragging = false; pointer_dragging = false;
break; break;
case MENU_INPUT_CTL_KEYBOARD_DISPLAY:
{
bool *ptr = (bool*)data;
*ptr = menu_input->keyboard.display;
}
break;
case MENU_INPUT_CTL_KEYBOARD_BUFF_PTR: case MENU_INPUT_CTL_KEYBOARD_BUFF_PTR:
{ {
const char **ptr = (const char**)data; const char **ptr = (const char**)data;

1
menu/menu_input.h
View File

@ -76,7 +76,6 @@ enum menu_input_ctl_state
MENU_INPUT_CTL_IS_POINTER_DRAGGED, MENU_INPUT_CTL_IS_POINTER_DRAGGED,
MENU_INPUT_CTL_SET_POINTER_DRAGGED, MENU_INPUT_CTL_SET_POINTER_DRAGGED,
MENU_INPUT_CTL_UNSET_POINTER_DRAGGED, MENU_INPUT_CTL_UNSET_POINTER_DRAGGED,
MENU_INPUT_CTL_KEYBOARD_DISPLAY,
MENU_INPUT_CTL_KEYBOARD_BUFF_PTR, MENU_INPUT_CTL_KEYBOARD_BUFF_PTR,
MENU_INPUT_CTL_KEYBOARD_LABEL, MENU_INPUT_CTL_KEYBOARD_LABEL,
MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING, MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING,