mirrors
/
Nuklear
mirror of https://github.com/Immediate-Mode-UI/Nuklear
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed typo #34 no.2

This commit is contained in:
vurtun 2016-01-03 23:20:50 +01:00
parent fab557b236
commit e6a305f020
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demo/demo.c
View File

@ -111,7 +111,7 @@ demo_window(struct zr_layout *layout, struct zr_context *ctx, enum theme *theme)
window_flags = 0;
ctx->style.header.align = header_align;
if (border) window_flags |= ZR_WINDOW_BORDER;
if (resize) window_flags |= ZR_WINDOW_SCALEABLE;
if (resize) window_flags |= ZR_WINDOW_SCALABLE;
if (moveable) window_flags |= ZR_WINDOW_MOVEABLE;
if (no_scrollbar) window_flags |= ZR_WINDOW_NO_SCROLLBAR;
if (minimizable) window_flags |= ZR_WINDOW_MINIMIZABLE;
@ -860,7 +860,7 @@ run_demo(struct demo *gui)
/* simple demo window */
if (zr_begin(ctx, &layout, "Show", zr_rect(20, 20, 200, 200),
ZR_WINDOW_BORDER|ZR_WINDOW_MOVEABLE|ZR_WINDOW_SCALEABLE|
ZR_WINDOW_BORDER|ZR_WINDOW_MOVEABLE|ZR_WINDOW_SCALABLE|
ZR_WINDOW_CLOSEABLE|ZR_WINDOW_MINIMIZABLE|ZR_WINDOW_TITLE))
{
enum {EASY, HARD};
@ -882,7 +882,7 @@ run_demo(struct demo *gui)
/* metrics window */
if (zr_begin(ctx, &layout, "Metrics", zr_rect(50, 600, 250, 300),
ZR_WINDOW_BORDER|ZR_WINDOW_MOVEABLE|ZR_WINDOW_SCALEABLE|
ZR_WINDOW_BORDER|ZR_WINDOW_MOVEABLE|ZR_WINDOW_SCALABLE|
ZR_WINDOW_CLOSEABLE|ZR_WINDOW_MINIMIZABLE))
{
struct zr_memory_status status;

4
zahnrad.c
View File

@ -7185,7 +7185,7 @@ zr_layout_begin(struct zr_context *ctx, const char *title)
/* calculate window footer height */
if (!(win->flags & ZR_WINDOW_NONBLOCK) &&
(!(win->flags & ZR_WINDOW_NO_SCROLLBAR) || (win->flags & ZR_WINDOW_SCALEABLE)))
(!(win->flags & ZR_WINDOW_NO_SCROLLBAR) || (win->flags & ZR_WINDOW_SCALABLE)))
layout->footer_h = scaler_size.y + item_padding.y;
else layout->footer_h = 0;
@ -7447,7 +7447,7 @@ zr_layout_end(struct zr_context *ctx)
/* draw the panel scaler into the right corner of the panel footer and
* update panel size if user drags the scaler */
if ((layout->flags & ZR_WINDOW_SCALEABLE) && in && !(layout->flags & ZR_WINDOW_MINIMIZED)) {
if ((layout->flags & ZR_WINDOW_SCALABLE) && in && !(layout->flags & ZR_WINDOW_MINIMIZED)) {
struct zr_color col = config->colors[ZR_COLOR_SCALER];
float scaler_w = MAX(0, scaler_size.x - item_padding.x);
float scaler_h = MAX(0, scaler_size.y - item_padding.y);

2
zahnrad.h
View File

@ -1131,7 +1131,7 @@ enum zr_window_flags {
ZR_WINDOW_MOVEABLE = ZR_FLAG(2),
/* The moveable flag inidicates that a window can be moved by user input or by
* dragging the window header */
ZR_WINDOW_SCALEABLE = ZR_FLAG(3),
ZR_WINDOW_SCALABLE = ZR_FLAG(3),
/* The scaleable flag indicates that a window can be scaled by user input
* by dragging a scaler icon at the button of the window */
ZR_WINDOW_CLOSEABLE = ZR_FLAG(4),