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

[nk] remove windows carriage returns

This commit is contained in:
radius 2016-06-05 22:18:39 -05:00
parent fa3fee12e9
commit fafb5cc272
1 changed files with 105 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
menu/drivers/nuklear/nk_menu.h
View File

@ -1,105 +1,105 @@
/* RetroArch - A frontend for libretro. /* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2016 - Daniel De Matteis * Copyright (C) 2011-2016 - Daniel De Matteis
* Copyright (C) 2014-2015 - Jean-André Santoni * Copyright (C) 2014-2015 - Jean-André Santoni
* Copyright (C) 2016 - Andrés Suárez * Copyright (C) 2016 - Andrés Suárez
* *
* RetroArch is free software: you can redistribute it and/or modify it under the terms * 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- * 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. * 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; * 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 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details. * 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. * You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
/* This file is intended for helper functions, custom controls, etc. */ /* This file is intended for helper functions, custom controls, etc. */
#ifndef _NK_MENU_H #ifndef _NK_MENU_H
#define _NK_MENU_H #define _NK_MENU_H
#include "nk_common.h" #include "nk_common.h"
#include "../../menu_display.h" #include "../../menu_display.h"
#include "../../menu_input.h" #include "../../menu_input.h"
enum enum
{ {
NK_TEXTURE_POINTER = 0, NK_TEXTURE_POINTER = 0,
NK_TEXTURE_LAST NK_TEXTURE_LAST
}; };
enum enum
{ {
NK_WND_MAIN = 0, NK_WND_MAIN = 0,
NK_WND_SETTINGS, NK_WND_SETTINGS,
NK_WND_FILE_PICKER, NK_WND_FILE_PICKER,
NK_WND_SHADER_PARAMETERS, NK_WND_SHADER_PARAMETERS,
NK_WND_LAST NK_WND_LAST
}; };
enum nk_menu_theme enum nk_menu_theme
{ {
THEME_DARK = 0, THEME_DARK = 0,
THEME_LIGHT THEME_LIGHT
}; };
struct icons { struct icons {
struct nk_image folder; struct nk_image folder;
struct nk_image monitor; struct nk_image monitor;
struct nk_image gamepad; struct nk_image gamepad;
struct nk_image settings; struct nk_image settings;
struct nk_image speaker; struct nk_image speaker;
struct nk_image invader; struct nk_image invader;
struct nk_image page_on; struct nk_image page_on;
struct nk_image page_off; struct nk_image page_off;
}; };
struct window { struct window {
bool open; bool open;
struct nk_vec2 position; struct nk_vec2 position;
struct nk_vec2 size; struct nk_vec2 size;
}; };
typedef struct nk_menu_handle typedef struct nk_menu_handle
{ {
/* nuklear mandatory */ /* nuklear mandatory */
void *memory; void *memory;
struct nk_context ctx; struct nk_context ctx;
struct nk_memory_status status; struct nk_memory_status status;
enum menu_action action; enum menu_action action;
/* window control variables */ /* window control variables */
struct nk_vec2 size; struct nk_vec2 size;
bool size_changed; bool size_changed;
struct window window[5]; struct window window[5];
/* menu driver variables */ /* menu driver variables */
char box_message[PATH_MAX_LENGTH]; char box_message[PATH_MAX_LENGTH];
/* image & theme related variables */ /* image & theme related variables */
char assets_directory[PATH_MAX_LENGTH]; char assets_directory[PATH_MAX_LENGTH];
struct icons icons; struct icons icons;
enum nk_menu_theme theme; enum nk_menu_theme theme;
struct struct
{ {
menu_texture_item bg; menu_texture_item bg;
menu_texture_item list[NK_TEXTURE_LAST]; menu_texture_item list[NK_TEXTURE_LAST];
} textures; } textures;
video_font_raster_block_t list_block; video_font_raster_block_t list_block;
} nk_menu_handle_t; } nk_menu_handle_t;
void nk_wnd_shader_parameters(nk_menu_handle_t *zr); void nk_wnd_shader_parameters(nk_menu_handle_t *zr);
void nk_wnd_main(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_file_picker(nk_menu_handle_t *zr, const char* startup_path);
void nk_wnd_settings(nk_menu_handle_t *zr); void nk_wnd_settings(nk_menu_handle_t *zr);
void nk_wnd_set_state(nk_menu_handle_t *zr, const int id, void nk_wnd_set_state(nk_menu_handle_t *zr, const int id,
struct nk_vec2 pos, struct nk_vec2 size); struct nk_vec2 pos, struct nk_vec2 size);
void nk_wnd_get_state(nk_menu_handle_t *zr, const int id, void nk_wnd_get_state(nk_menu_handle_t *zr, const int id,
struct nk_vec2 *pos, struct nk_vec2 *size); struct nk_vec2 *pos, struct nk_vec2 *size);
#endif #endif