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

Fixed some code style issues 

Enforced the correct code style and tab index width of 4 instead of 2.
This commit is contained in:
vurtun 2016-06-25 10:38:34 +02:00
parent b82cf7251e
commit 4d390a9c46
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nuklear.h
View File

@ -15634,14 +15634,11 @@ nk_panel_begin(struct nk_context *ctx, const char *title)
/* calculate window footer height */
layout->footer_h = 0;
if (!(win->flags & NK_WINDOW_NONBLOCK)) {
if (!(win->flags & NK_WINDOW_NO_SCROLLBAR)) {
layout->footer_h = scrollbar_size.y + style->window.footer_padding.y;
}
if (win->flags & NK_WINDOW_SCALABLE) {
layout->footer_h = NK_MAX(layout->footer_h, scaler_size.y + style->window.footer_padding.y);
}
if (!(win->flags & NK_WINDOW_NO_SCROLLBAR))
layout->footer_h = scrollbar_size.y + style->window.footer_padding.y;
if (win->flags & NK_WINDOW_SCALABLE)
layout->footer_h = NK_MAX(layout->footer_h, scaler_size.y + style->window.footer_padding.y);
}
/* calculate the window size */
@ -15743,13 +15740,13 @@ nk_panel_begin(struct nk_context *ctx, const char *title)
int text_len = nk_strlen(title);
struct nk_rect label = {0,0,0,0};
float t = font->width(font->userdata, font->height, title, text_len);
text.padding = nk_vec2(0,0);
label.x = header.x + style->window.header.padding.x;
label.x += style->window.header.label_padding.x;
label.y = header.y + style->window.header.label_padding.y;
label.h = font->height + 2 * style->window.header.label_padding.y;
label.w = t + 2 * style->window.header.spacing.x;
text.padding = nk_vec2(0,0);
nk_widget_text(out, label,(const char*)title, text_len, &text,
NK_TEXT_LEFT, font);
}