Merge pull request #60932 from Geometror/button-fix-expand-icon

akien-mga · web-flow · commit 694baff233c2 · 2022-05-10T22:58:56.000+02:00
diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp
@@ -258,7 +258,8 @@ void Button::_notification(int p_what) {
 
 				if (expand_icon) {
 					Size2 _size = get_size() - style->get_offset() * 2;
-					_size.width -= get_theme_constant(SNAME("h_separation")) + icon_ofs_region;
+					int icon_text_separation = text.is_empty() ? 0 : get_theme_constant(SNAME("h_separation"));
+					_size.width -= icon_text_separation + icon_ofs_region;
 					if (!clip_text && icon_align_rtl_checked != HORIZONTAL_ALIGNMENT_CENTER) {
 						_size.width -= text_buf->get_size().width;
 					}

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,8 @@ void Button::_notification(int p_what) {`
`258`	`258`
`259`	`259`	`if (expand_icon) {`
`260`	`260`	`Size2 _size = get_size() - style->get_offset() * 2;`
`261`		`- _size.width -= get_theme_constant(SNAME("h_separation")) + icon_ofs_region;`
	`261`	`+ int icon_text_separation = text.is_empty() ? 0 : get_theme_constant(SNAME("h_separation"));`
	`262`	`+ _size.width -= icon_text_separation + icon_ofs_region;`
`262`	`263`	`if (!clip_text && icon_align_rtl_checked != HORIZONTAL_ALIGNMENT_CENTER) {`
`263`	`264`	`_size.width -= text_buf->get_size().width;`
`264`	`265`	`}`