mirrors/Nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mirrors:a18175cff08a2fbb6adfaa790995435d23df2f7a
Branches Tags
mirrors:master
mirrors:revert-721-const-correctness
mirrors:roundf-allow-override
mirrors:node_demo--example
mirrors:demo-overview-headers
mirrors:demo-overview--time
mirrors:delta_time_seconds
mirrors:emscripten-offset
mirrors:nk_input_is_mouse_moved
mirrors:add-symbol-triangle-outline
mirrors:xcb-cairo
mirrors:property-optional-label
mirrors:demo-overview-show_markers
mirrors:fix-y_offset
mirrors:rawfb
mirrors:cmake
mirrors:4.12.0
mirrors:4.10.7
mirrors:4.10.6
mirrors:4.10.5
mirrors:4.10.1
mirrors:4.9.6
mirrors:4.9.5
mirrors:4.9.4
mirrors:4.09.3
mirrors:4.09.1
..
compare: mirrors:141d3cf9c695dfd47775a88ff01ad162d4b4a64f
Branches Tags
mirrors:master
mirrors:revert-721-const-correctness
mirrors:roundf-allow-override
mirrors:node_demo--example
mirrors:demo-overview-headers
mirrors:demo-overview--time
mirrors:delta_time_seconds
mirrors:emscripten-offset
mirrors:nk_input_is_mouse_moved
mirrors:add-symbol-triangle-outline
mirrors:xcb-cairo
mirrors:property-optional-label
mirrors:demo-overview-show_markers
mirrors:fix-y_offset
mirrors:rawfb
mirrors:cmake
mirrors:4.12.0
mirrors:4.10.7
mirrors:4.10.6
mirrors:4.10.5
mirrors:4.10.1
mirrors:4.9.6
mirrors:4.9.5
mirrors:4.9.4
mirrors:4.09.3
mirrors:4.09.1

3 Commits
a18175cff0 ... 141d3cf9c6

Author SHA1 Message Date
Rob Loach
141d3cf9c6
Merge pull request #586 from mackron/button_text_alignment 
Fix button text alignment
 2023-11-16 02:10:25 -06:00
David Reid
42e4c54954 Bump patch version in clib.json. 2023-11-14 18:02:22 +10:00
David Reid
a668105390 Fix button text alignment error. 
When calculating the width and height of the content rect of a button,
only the border of one side is being taken into account. Instead the
border width needs to be multiplied by two before subtracting from the
bounds. This is being done for padding and rounding, but not border,
which is resulting in text being misaligned, most notably when using
buttons with thick borders.
 2023-11-14 15:39:10 +10:00
3 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
clib.json
View File

@ -1,6 +1,6 @@
{
"name": "nuklear",
"version": "4.10.6",
"version": "4.10.7",
"repo": "Immediate-Mode-UI/Nuklear",
"description": "A small ANSI C gui toolkit",
"keywords": ["gl", "ui", "toolkit"],

4
nuklear.h
View File

@ -23892,8 +23892,8 @@ nk_do_button(nk_flags *state, struct nk_command_buffer *out, struct nk_rect r,
/* calculate button content space */
content->x = r.x + style->padding.x + 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->h = r.h - (2 * style->padding.y + 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));
/* execute button behavior */
bounds.x = r.x - style->touch_padding.x;

4
src/nuklear_button.c
View File

@ -127,8 +127,8 @@ nk_do_button(nk_flags *state, struct nk_command_buffer *out, struct nk_rect r,
/* calculate button content space */
content->x = r.x + style->padding.x + 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->h = r.h - (2 * style->padding.y + 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));
/* execute button behavior */
bounds.x = r.x - style->touch_padding.x;