Fixed tabs not being shown as disabled properly
This commit is contained in:
parent
4545d184d3
commit
f88d7b58bb
10
nuklear.h
10
nuklear.h
|
@ -22483,15 +22483,15 @@ nk_tree_state_base(struct nk_context *ctx, enum nk_tree_type type,
|
|||
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
nk_draw_image(out, header, &background->data.image, nk_white);
|
||||
nk_draw_image(out, header, &background->data.image, nk_rgb_factor(nk_white, style->tab.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
nk_draw_nine_slice(out, header, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(out, header, &background->data.slice, nk_rgb_factor(nk_white, style->tab.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
nk_fill_rect(out, header, 0, style->tab.border_color);
|
||||
nk_fill_rect(out, header, 0, nk_rgb_factor(style->tab.border_color, style->tab.color_factor));
|
||||
nk_fill_rect(out, nk_shrink_rect(header, style->tab.border),
|
||||
style->tab.rounding, background->data.color);
|
||||
style->tab.rounding, nk_rgb_factor(background->data.color, style->tab.color_factor));
|
||||
break;
|
||||
}
|
||||
} else text.background = style->window.background;
|
||||
|
@ -22536,7 +22536,7 @@ nk_tree_state_base(struct nk_context *ctx, enum nk_tree_type type,
|
|||
label.y = sym.y;
|
||||
label.w = header.w - (sym.w + item_spacing.y + style->tab.indent);
|
||||
label.h = style->font->height;
|
||||
text.text = style->tab.text;
|
||||
text.text = nk_rgb_factor(style->tab.text, style->tab.color_factor);
|
||||
text.padding = nk_vec2(0,0);
|
||||
nk_widget_text(out, label, title, nk_strlen(title), &text,
|
||||
NK_TEXT_LEFT, style->font);}
|
||||
|
|
|
@ -52,15 +52,15 @@ nk_tree_state_base(struct nk_context *ctx, enum nk_tree_type type,
|
|||
|
||||
switch(background->type) {
|
||||
case NK_STYLE_ITEM_IMAGE:
|
||||
nk_draw_image(out, header, &background->data.image, nk_white);
|
||||
nk_draw_image(out, header, &background->data.image, nk_rgb_factor(nk_white, style->tab.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_NINE_SLICE:
|
||||
nk_draw_nine_slice(out, header, &background->data.slice, nk_white);
|
||||
nk_draw_nine_slice(out, header, &background->data.slice, nk_rgb_factor(nk_white, style->tab.color_factor));
|
||||
break;
|
||||
case NK_STYLE_ITEM_COLOR:
|
||||
nk_fill_rect(out, header, 0, style->tab.border_color);
|
||||
nk_fill_rect(out, header, 0, nk_rgb_factor(style->tab.border_color, style->tab.color_factor));
|
||||
nk_fill_rect(out, nk_shrink_rect(header, style->tab.border),
|
||||
style->tab.rounding, background->data.color);
|
||||
style->tab.rounding, nk_rgb_factor(background->data.color, style->tab.color_factor));
|
||||
break;
|
||||
}
|
||||
} else text.background = style->window.background;
|
||||
|
@ -105,7 +105,7 @@ nk_tree_state_base(struct nk_context *ctx, enum nk_tree_type type,
|
|||
label.y = sym.y;
|
||||
label.w = header.w - (sym.w + item_spacing.y + style->tab.indent);
|
||||
label.h = style->font->height;
|
||||
text.text = style->tab.text;
|
||||
text.text = nk_rgb_factor(style->tab.text, style->tab.color_factor);
|
||||
text.padding = nk_vec2(0,0);
|
||||
nk_widget_text(out, label, title, nk_strlen(title), &text,
|
||||
NK_TEXT_LEFT, style->font);}
|
||||
|
|
Loading…
Reference in New Issue