Only apply image_padding to content position/width

Immediate-Mode-UI · Aug 31, 2024 · 41072b4 · 41072b4
1 parent 11a165f
commit 41072b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/nuklear.h b/nuklear.h
@@ -24559,11 +24559,11 @@ nk_do_button_text_image(nk_flags *state,
     if (align & NK_TEXT_ALIGN_LEFT) {
         icon.x = (bounds.x + bounds.w) - (2 * style->padding.x + icon.w);
         icon.x = NK_MAX(icon.x, 0);
-        content.w -= (2 * style->padding.x + icon.w);
+        content.w -= icon.w;
     } else {
         icon.x = bounds.x + 2 * style->padding.x;
-        content.x += icon.w + 2 * style->padding.x;
-        content.w = NK_MAX(content.w - (2 * style->padding.x + icon.w), 0);
+        content.x += icon.w;
+        content.w = NK_MAX(content.w - icon.w, 0);
     }
 
     icon.x += style->image_padding.x;
@@ -24572,6 +24572,7 @@ nk_do_button_text_image(nk_flags *state,
     icon.h -= 2 * style->image_padding.y;
 
     content.x += style->image_padding.x;
+    content.w -= style->image_padding.x;
 
     if (style->draw_begin) style->draw_begin(out, style->userdata);
     nk_draw_button_text_image(out, &bounds, &content, &icon, *state, style, str, len, font, &img);

diff --git a/src/nuklear_button.c b/src/nuklear_button.c
@@ -397,11 +397,11 @@ nk_do_button_text_image(nk_flags *state,
     if (align & NK_TEXT_ALIGN_LEFT) {
         icon.x = (bounds.x + bounds.w) - (2 * style->padding.x + icon.w);
         icon.x = NK_MAX(icon.x, 0);
-        content.w -= (2 * style->padding.x + icon.w);
+        content.w -= icon.w;
     } else {
         icon.x = bounds.x + 2 * style->padding.x;
-        content.x += icon.w + 2 * style->padding.x;
-        content.w = NK_MAX(content.w - (2 * style->padding.x + icon.w), 0);
+        content.x += icon.w;
+        content.w = NK_MAX(content.w - icon.w, 0);
     }
 
     icon.x += style->image_padding.x;
@@ -410,6 +410,7 @@ nk_do_button_text_image(nk_flags *state,
     icon.h -= 2 * style->image_padding.y;
 
     content.x += style->image_padding.x;
+    content.w -= style->image_padding.x;
 
     if (style->draw_begin) style->draw_begin(out, style->userdata);
     nk_draw_button_text_image(out, &bounds, &content, &icon, *state, style, str, len, font, &img);