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

(GLUI) Indenting nits

This commit is contained in:
twinaphex 2015-07-08 17:26:51 +02:00
parent 82cd8263dc
commit 54e6048cd2
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
menu/drivers/glui.c
View File

@ -75,7 +75,7 @@ static void glui_blit_line(float x, float y,
params.x = x / width; params.x = x / width;
params.y = 1.0f - (y + glui->line_height/2 + disp->font.size/3) params.y = 1.0f - (y + glui->line_height/2 + disp->font.size/3)
/ height; / height;
params.scale = 1.0; params.scale = 1.0;
params.color = color; params.color = color;
params.full_screen = true; params.full_screen = true;
@ -269,8 +269,8 @@ static void glui_render(void)
if (settings->menu.pointer.enable) if (settings->menu.pointer.enable)
{ {
menu_input->pointer.ptr = menu_input->pointer.ptr =
(menu_input->pointer.y - glui->line_height + menu->scroll_y - 16) (menu_input->pointer.y - glui->line_height + menu->scroll_y - 16)
/ glui->line_height; / glui->line_height;
if (menu_input->pointer.dragging) if (menu_input->pointer.dragging)
menu->scroll_y -= menu_input->pointer.dy; menu->scroll_y -= menu_input->pointer.dy;
@ -285,8 +285,8 @@ static void glui_render(void)
menu->scroll_y -= 10; menu->scroll_y -= 10;
menu_input->mouse.ptr = menu_input->mouse.ptr =
(menu_input->mouse.y - glui->line_height + menu->scroll_y - 16) (menu_input->mouse.y - glui->line_height + menu->scroll_y - 16)
/ glui->line_height; / glui->line_height;
} }
if (menu_entries_get_end() < height / glui->line_height) if (menu_entries_get_end() < height / glui->line_height)
@ -296,12 +296,12 @@ static void glui_render(void)
menu->scroll_y = 0; menu->scroll_y = 0;
bottom = menu_entries_get_end() * glui->line_height bottom = menu_entries_get_end() * glui->line_height
- height + disp->header_height * 2; - height + disp->header_height * 2;
if (menu->scroll_y > bottom) if (menu->scroll_y > bottom)
menu->scroll_y = bottom; menu->scroll_y = bottom;
if (menu_entries_get_end() * glui->line_height if (menu_entries_get_end() * glui->line_height
< height - disp->header_height*2) < height - disp->header_height*2)
menu->scroll_y = 0; menu->scroll_y = 0;
} }
@ -510,10 +510,10 @@ static void glui_layout(menu_handle_t *menu, glui_handle_t *glui)
unsigned width, height; unsigned width, height;
video_driver_get_size(&width, &height); video_driver_get_size(&width, &height);
/* Mobiles platforms may have very small display metrics coupled to a high /* Mobiles platforms may have very small display metrics coupled to a high
resolution, so we should be dpi aware to ensure the entries hitboxes are big resolution, so we should be dpi aware to ensure the entries hitboxes are big
enough. On desktops, we just care about readability, with every widget size enough. On desktops, we just care about readability, with every widget size
proportional to the display width. */ proportional to the display width. */
#ifdef RARCH_MOBILE #ifdef RARCH_MOBILE
scale_factor = menu_display_get_dpi(); scale_factor = menu_display_get_dpi();
#else #else
@ -664,7 +664,7 @@ static float glui_get_scroll(void)
glui = (glui_handle_t*)menu->userdata; glui = (glui_handle_t*)menu->userdata;
if (glui->line_height) if (glui->line_height)
half = (height / glui->line_height) / 2; half = (height / glui->line_height) / 2;
if (nav->selection_ptr < (unsigned)half) if (nav->selection_ptr < (unsigned)half)
return 0; return 0;