Merge pull request #586 from mackron/button_text_alignment
Fix button text alignment
This commit is contained in:
commit
141d3cf9c6
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "nuklear",
|
"name": "nuklear",
|
||||||
"version": "4.10.6",
|
"version": "4.10.7",
|
||||||
"repo": "Immediate-Mode-UI/Nuklear",
|
"repo": "Immediate-Mode-UI/Nuklear",
|
||||||
"description": "A small ANSI C gui toolkit",
|
"description": "A small ANSI C gui toolkit",
|
||||||
"keywords": ["gl", "ui", "toolkit"],
|
"keywords": ["gl", "ui", "toolkit"],
|
||||||
|
|
|
@ -23892,8 +23892,8 @@ nk_do_button(nk_flags *state, struct nk_command_buffer *out, struct nk_rect r,
|
||||||
/* calculate button content space */
|
/* calculate button content space */
|
||||||
content->x = r.x + style->padding.x + style->border + style->rounding;
|
content->x = r.x + style->padding.x + style->border + style->rounding;
|
||||||
content->y = r.y + style->padding.y + style->border + style->rounding;
|
content->y = r.y + style->padding.y + style->border + style->rounding;
|
||||||
content->w = r.w - (2 * style->padding.x + style->border + style->rounding*2);
|
content->w = r.w - (2 * (style->padding.x + style->border + style->rounding));
|
||||||
content->h = r.h - (2 * style->padding.y + style->border + style->rounding*2);
|
content->h = r.h - (2 * (style->padding.y + style->border + style->rounding));
|
||||||
|
|
||||||
/* execute button behavior */
|
/* execute button behavior */
|
||||||
bounds.x = r.x - style->touch_padding.x;
|
bounds.x = r.x - style->touch_padding.x;
|
||||||
|
|
|
@ -127,8 +127,8 @@ nk_do_button(nk_flags *state, struct nk_command_buffer *out, struct nk_rect r,
|
||||||
/* calculate button content space */
|
/* calculate button content space */
|
||||||
content->x = r.x + style->padding.x + style->border + style->rounding;
|
content->x = r.x + style->padding.x + style->border + style->rounding;
|
||||||
content->y = r.y + style->padding.y + style->border + style->rounding;
|
content->y = r.y + style->padding.y + style->border + style->rounding;
|
||||||
content->w = r.w - (2 * style->padding.x + style->border + style->rounding*2);
|
content->w = r.w - (2 * (style->padding.x + style->border + style->rounding));
|
||||||
content->h = r.h - (2 * style->padding.y + style->border + style->rounding*2);
|
content->h = r.h - (2 * (style->padding.y + style->border + style->rounding));
|
||||||
|
|
||||||
/* execute button behavior */
|
/* execute button behavior */
|
||||||
bounds.x = r.x - style->touch_padding.x;
|
bounds.x = r.x - style->touch_padding.x;
|
||||||
|
|
Loading…
Reference in New Issue