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

(Nuklear) Cleanups

This commit is contained in:
twinaphex 2016-05-26 06:34:13 +02:00
parent 7780162d53
commit 9d1273ce58
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/drivers/nuklear/nk_wnd_main.c
View File

@ -29,9 +29,6 @@
#include "../../menu_driver.h" #include "../../menu_driver.h"
#include "../../menu_hash.h" #include "../../menu_hash.h"
void nk_wnd_main(nk_menu_handle_t *zr) void nk_wnd_main(nk_menu_handle_t *zr)
{ {
unsigned i; unsigned i;
@ -46,10 +43,9 @@ void nk_wnd_main(nk_menu_handle_t *zr)
NK_WINDOW_SCALABLE|NK_WINDOW_BORDER)) NK_WINDOW_SCALABLE|NK_WINDOW_BORDER))
{ {
nk_layout_row_dynamic(ctx, 30, 1); nk_layout_row_dynamic(ctx, 30, 1);
} }
/* save position and size to restore after context reset */ /* save position and size to restore after context reset */
nk_wnd_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx)); nk_wnd_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx));
nk_end(ctx); nk_end(ctx);
} }

8
menu/drivers/nuklear/nk_wnd_settings.c
View File

@ -29,9 +29,6 @@
#include "../../menu_driver.h" #include "../../menu_driver.h"
#include "../../menu_hash.h" #include "../../menu_hash.h"
void nk_wnd_settings(nk_menu_handle_t *zr) void nk_wnd_settings(nk_menu_handle_t *zr)
{ {
unsigned i; unsigned i;
@ -46,10 +43,9 @@ void nk_wnd_settings(nk_menu_handle_t *zr)
NK_WINDOW_SCALABLE|NK_WINDOW_BORDER)) NK_WINDOW_SCALABLE|NK_WINDOW_BORDER))
{ {
nk_layout_row_dynamic(ctx, 30, 1); nk_layout_row_dynamic(ctx, 30, 1);
} }
/* save position and size to restore after context reset */ /* save position and size to restore after context reset */
nk_wnd_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx)); nk_wnd_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx));
nk_end(ctx); nk_end(ctx);
} }

10
menu/drivers/nuklear/nk_wnd_shader_parameters.c
View File

@ -34,7 +34,6 @@
#include "../../../configuration.h" #include "../../../configuration.h"
#include "../../../retroarch.h" #include "../../../retroarch.h"
void nk_wnd_shader_parameters(nk_menu_handle_t *zr) void nk_wnd_shader_parameters(nk_menu_handle_t *zr)
{ {
unsigned i; unsigned i;
@ -58,12 +57,6 @@ void nk_wnd_shader_parameters(nk_menu_handle_t *zr)
{ {
if (!string_is_empty(shader_info.data->parameters[i].desc)) if (!string_is_empty(shader_info.data->parameters[i].desc))
{ {
/* if(shader_info.data->parameters[i].minimum == 0 &&
shader_info.data->parameters[i].maximum == 1 &&
shader_info.data->parameters[i].step == 1)
nk_checkbox_float(ctx, shader_info.data->parameters[i].desc,
&(shader_info.data->parameters[i].current));
else*/
nk_property_float(ctx, shader_info.data->parameters[i].desc, nk_property_float(ctx, shader_info.data->parameters[i].desc,
shader_info.data->parameters[i].minimum, shader_info.data->parameters[i].minimum,
&(shader_info.data->parameters[i].current), &(shader_info.data->parameters[i].current),
@ -73,7 +66,8 @@ void nk_wnd_shader_parameters(nk_menu_handle_t *zr)
} }
} }
} }
/* save position and size to restore after context reset */ /* save position and size to restore after context reset */
nk_wnd_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx)); nk_wnd_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx));
nk_end(ctx); nk_end(ctx);
} }