From fafb5cc272581c4122243e3afc02b3136f7b23a0 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 5 Jun 2016 22:18:39 -0500 Subject: [PATCH] [nk] remove windows carriage returns --- menu/drivers/nuklear/nk_menu.h | 210 ++++++++++++++++----------------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/menu/drivers/nuklear/nk_menu.h b/menu/drivers/nuklear/nk_menu.h index cca37660e5..dc2438a0ad 100644 --- a/menu/drivers/nuklear/nk_menu.h +++ b/menu/drivers/nuklear/nk_menu.h @@ -1,105 +1,105 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2011-2016 - Daniel De Matteis - * Copyright (C) 2014-2015 - Jean-André Santoni - * Copyright (C) 2016 - Andrés Suárez - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -/* This file is intended for helper functions, custom controls, etc. */ - -#ifndef _NK_MENU_H -#define _NK_MENU_H - -#include "nk_common.h" -#include "../../menu_display.h" -#include "../../menu_input.h" - -enum -{ - NK_TEXTURE_POINTER = 0, - NK_TEXTURE_LAST -}; - -enum -{ - NK_WND_MAIN = 0, - NK_WND_SETTINGS, - NK_WND_FILE_PICKER, - NK_WND_SHADER_PARAMETERS, - NK_WND_LAST -}; - -enum nk_menu_theme -{ - THEME_DARK = 0, - THEME_LIGHT -}; - -struct icons { - struct nk_image folder; - struct nk_image monitor; - struct nk_image gamepad; - struct nk_image settings; - struct nk_image speaker; - struct nk_image invader; - struct nk_image page_on; - struct nk_image page_off; -}; - -struct window { - bool open; - struct nk_vec2 position; - struct nk_vec2 size; -}; - -typedef struct nk_menu_handle -{ - /* nuklear mandatory */ - void *memory; - struct nk_context ctx; - struct nk_memory_status status; - enum menu_action action; - - /* window control variables */ - struct nk_vec2 size; - bool size_changed; - struct window window[5]; - - /* menu driver variables */ - char box_message[PATH_MAX_LENGTH]; - - /* image & theme related variables */ - char assets_directory[PATH_MAX_LENGTH]; - struct icons icons; - enum nk_menu_theme theme; - - - struct - { - menu_texture_item bg; - menu_texture_item list[NK_TEXTURE_LAST]; - } textures; - - video_font_raster_block_t list_block; -} nk_menu_handle_t; - -void nk_wnd_shader_parameters(nk_menu_handle_t *zr); -void nk_wnd_main(nk_menu_handle_t *zr); -void nk_wnd_file_picker(nk_menu_handle_t *zr, const char* startup_path); -void nk_wnd_settings(nk_menu_handle_t *zr); -void nk_wnd_set_state(nk_menu_handle_t *zr, const int id, - struct nk_vec2 pos, struct nk_vec2 size); -void nk_wnd_get_state(nk_menu_handle_t *zr, const int id, - struct nk_vec2 *pos, struct nk_vec2 *size); - -#endif +/* RetroArch - A frontend for libretro. + * Copyright (C) 2011-2016 - Daniel De Matteis + * Copyright (C) 2014-2015 - Jean-André Santoni + * Copyright (C) 2016 - Andrés Suárez + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +/* This file is intended for helper functions, custom controls, etc. */ + +#ifndef _NK_MENU_H +#define _NK_MENU_H + +#include "nk_common.h" +#include "../../menu_display.h" +#include "../../menu_input.h" + +enum +{ + NK_TEXTURE_POINTER = 0, + NK_TEXTURE_LAST +}; + +enum +{ + NK_WND_MAIN = 0, + NK_WND_SETTINGS, + NK_WND_FILE_PICKER, + NK_WND_SHADER_PARAMETERS, + NK_WND_LAST +}; + +enum nk_menu_theme +{ + THEME_DARK = 0, + THEME_LIGHT +}; + +struct icons { + struct nk_image folder; + struct nk_image monitor; + struct nk_image gamepad; + struct nk_image settings; + struct nk_image speaker; + struct nk_image invader; + struct nk_image page_on; + struct nk_image page_off; +}; + +struct window { + bool open; + struct nk_vec2 position; + struct nk_vec2 size; +}; + +typedef struct nk_menu_handle +{ + /* nuklear mandatory */ + void *memory; + struct nk_context ctx; + struct nk_memory_status status; + enum menu_action action; + + /* window control variables */ + struct nk_vec2 size; + bool size_changed; + struct window window[5]; + + /* menu driver variables */ + char box_message[PATH_MAX_LENGTH]; + + /* image & theme related variables */ + char assets_directory[PATH_MAX_LENGTH]; + struct icons icons; + enum nk_menu_theme theme; + + + struct + { + menu_texture_item bg; + menu_texture_item list[NK_TEXTURE_LAST]; + } textures; + + video_font_raster_block_t list_block; +} nk_menu_handle_t; + +void nk_wnd_shader_parameters(nk_menu_handle_t *zr); +void nk_wnd_main(nk_menu_handle_t *zr); +void nk_wnd_file_picker(nk_menu_handle_t *zr, const char* startup_path); +void nk_wnd_settings(nk_menu_handle_t *zr); +void nk_wnd_set_state(nk_menu_handle_t *zr, const int id, + struct nk_vec2 pos, struct nk_vec2 size); +void nk_wnd_get_state(nk_menu_handle_t *zr, const int id, + struct nk_vec2 *pos, struct nk_vec2 *size); + +#endif