Merge pull request #630 from RobLoach/fix-overview-warning

Fix overview mixed declarations
This commit is contained in:
Rob Loach 2024-04-05 15:25:44 -04:00 committed by GitHub
commit 7194b523f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -6,14 +6,15 @@ overview(struct nk_context *ctx)
static nk_flags window_flags = NK_WINDOW_TITLE|NK_WINDOW_BORDER|NK_WINDOW_SCALABLE|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE; static nk_flags window_flags = NK_WINDOW_TITLE|NK_WINDOW_BORDER|NK_WINDOW_SCALABLE|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE;
nk_flags actual_window_flags; nk_flags actual_window_flags;
/* widget flags */
static nk_bool disable_widgets = nk_false;
/* popups */ /* popups */
static enum nk_style_header_align header_align = NK_HEADER_RIGHT; static enum nk_style_header_align header_align = NK_HEADER_RIGHT;
static nk_bool show_app_about = nk_false; static nk_bool show_app_about = nk_false;
ctx->style.window.header.align = header_align; ctx->style.window.header.align = header_align;
static nk_bool disable_widgets = nk_false;
actual_window_flags = window_flags; actual_window_flags = window_flags;
if (!(actual_window_flags & NK_WINDOW_TITLE)) if (!(actual_window_flags & NK_WINDOW_TITLE))
actual_window_flags &= ~(NK_WINDOW_MINIMIZABLE|NK_WINDOW_CLOSABLE); actual_window_flags &= ~(NK_WINDOW_MINIMIZABLE|NK_WINDOW_CLOSABLE);