update LICENSE year
This commit is contained in:
parent
a19590b738
commit
bcabde32ab
2
LICENSE
2
LICENSE
@ -1,4 +1,4 @@
|
|||||||
Copyright (c) 2015 Micha Mettke
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2015 Micha Mettke
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2015 Micha Mettke
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2015 Micha Mettke
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
/*
|
||||||
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
|
This software is provided 'as-is', without any express or implied
|
||||||
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
arising from the use of this software.
|
||||||
|
|
||||||
|
Permission is granted to anyone to use this software for any purpose,
|
||||||
|
including commercial applications, and to alter it and redistribute it
|
||||||
|
freely, subject to the following restrictions:
|
||||||
|
|
||||||
|
1. The origin of this software must not be misrepresented; you must not
|
||||||
|
claim that you wrote the original software. If you use this software
|
||||||
|
in a product, an acknowledgment in the product documentation would be
|
||||||
|
appreciated but is not required.
|
||||||
|
2. Altered source versions must be plainly marked as such, and must not be
|
||||||
|
misrepresented as being the original software.
|
||||||
|
3. This notice may not be removed or altered from any source distribution.
|
||||||
|
*/
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2015 Micha Mettke
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2015 Micha Mettke
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2015 Micha Mettke
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2015 Micha Mettke
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
@ -407,6 +407,7 @@ basic_demo(struct zr_context *ctx, struct icons *img)
|
|||||||
selected_icon = i;
|
selected_icon = i;
|
||||||
zr_combo_end(ctx);
|
zr_combo_end(ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*------------------------------------------------
|
/*------------------------------------------------
|
||||||
* CHECKBOX
|
* CHECKBOX
|
||||||
*------------------------------------------------*/
|
*------------------------------------------------*/
|
||||||
@ -682,7 +683,6 @@ main(int argc, char *argv[])
|
|||||||
struct icons icons;
|
struct icons icons;
|
||||||
struct zr_context ctx;
|
struct zr_context ctx;
|
||||||
void *memory;
|
void *memory;
|
||||||
|
|
||||||
if (argc < 2) {
|
if (argc < 2) {
|
||||||
fprintf(stdout,"Missing TTF Font file argument: demo <path>\n");
|
fprintf(stdout,"Missing TTF Font file argument: demo <path>\n");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2015 Micha Mettke
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2015 Micha Mettke
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2015 Micha Mettke
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2015 Micha Mettke
|
Copyright (c) 2016 Micha Mettke
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
@ -1373,20 +1373,19 @@ void zr_layout_row_end(struct zr_context*);
|
|||||||
void zr_layout_row(struct zr_context*, enum zr_layout_format, float height,
|
void zr_layout_row(struct zr_context*, enum zr_layout_format, float height,
|
||||||
zr_size cols, const float *ratio);
|
zr_size cols, const float *ratio);
|
||||||
|
|
||||||
/* layouting with custom position and width and height of widgets */
|
/* layouting with custom position and size of widgets */
|
||||||
void zr_layout_space_begin(struct zr_context*, enum zr_layout_format,
|
void zr_layout_space_begin(struct zr_context*, enum zr_layout_format,
|
||||||
float height, zr_size widget_count);
|
float height, zr_size widget_count);
|
||||||
void zr_layout_space_push(struct zr_context*, struct zr_rect);
|
void zr_layout_space_push(struct zr_context*, struct zr_rect);
|
||||||
void zr_layout_space_end(struct zr_context*);
|
void zr_layout_space_end(struct zr_context*);
|
||||||
|
|
||||||
/* utility functions for custom size + position widgets */
|
|
||||||
struct zr_rect zr_layout_space_bounds(struct zr_context*);
|
struct zr_rect zr_layout_space_bounds(struct zr_context*);
|
||||||
struct zr_vec2 zr_layout_space_to_screen(struct zr_context*, struct zr_vec2);
|
struct zr_vec2 zr_layout_space_to_screen(struct zr_context*, struct zr_vec2);
|
||||||
struct zr_vec2 zr_layout_space_to_local(struct zr_context*, struct zr_vec2);
|
struct zr_vec2 zr_layout_space_to_local(struct zr_context*, struct zr_vec2);
|
||||||
struct zr_rect zr_layout_space_rect_to_screen(struct zr_context*, struct zr_rect);
|
struct zr_rect zr_layout_space_rect_to_screen(struct zr_context*, struct zr_rect);
|
||||||
struct zr_rect zr_layout_space_rect_to_local(struct zr_context*, struct zr_rect);
|
struct zr_rect zr_layout_space_rect_to_local(struct zr_context*, struct zr_rect);
|
||||||
|
|
||||||
/* group */
|
/* group layout */
|
||||||
int zr_group_begin(struct zr_context*, struct zr_layout*, const char *title, zr_flags);
|
int zr_group_begin(struct zr_context*, struct zr_layout*, const char *title, zr_flags);
|
||||||
void zr_group_end(struct zr_context *ctx);
|
void zr_group_end(struct zr_context *ctx);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user