From 6df415f5e06c8b61265cde5fa9bfdd6d57c55b8f Mon Sep 17 00:00:00 2001 From: vurtun Date: Tue, 12 Jan 2016 22:01:17 +0100 Subject: [PATCH] fixed zr_size size --- zahnrad.c | 6 +++--- zahnrad.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zahnrad.c b/zahnrad.c index 2aaa18e..7914429 100644 --- a/zahnrad.c +++ b/zahnrad.c @@ -102,7 +102,7 @@ enum zr_internal_window_flags { struct zr_popup { struct zr_window *win; enum zr_internal_window_flags type; - zr_ulong name; + zr_hash name; int active; unsigned con_count, con_old; @@ -6770,7 +6770,7 @@ zr_begin(struct zr_context *ctx, struct zr_layout *layout, /* NOTE: I am not really sure if activating a window should directly * happen on that frame or the following frame. Directly would simplify - * clicking window closing/minimizing but could case wrong behavior. + * clicking window closing/minimizing but could cause wrong behavior. * For now I activate the window on the next frame to prevent wrong * behavior. If not wanted just replace line with: * win->flags &= ~(zr_flags)ZR_WINDOW_ROM; */ @@ -6779,7 +6779,7 @@ zr_begin(struct zr_context *ctx, struct zr_layout *layout, } if (ctx->end != win) win->flags |= ZR_WINDOW_ROM; - } + } win->layout = layout; ctx->current = win; diff --git a/zahnrad.h b/zahnrad.h index 85a9e39..5095226 100644 --- a/zahnrad.h +++ b/zahnrad.h @@ -80,7 +80,7 @@ extern "C" { typedef uint32_t zr_uint; typedef uint32_t zr_hash; typedef uint64_t zr_ulong; -typedef uint64_t zr_size; +typedef uintptr_t zr_size; typedef uintptr_t zr_ptr; typedef uint32_t zr_flags; typedef uint32_t zr_rune;