asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #87474 from Rindbee/fix-forgetting-h_separation-when-internal_elements-exist

Browse source 
Fix forgetting `h_separation` when internal elements exist
This commit is contained in:
Yuri Sizov 2024-01-22 20:39:36 +01:00
commit a07df648ec
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scene/gui/button.cpp
View file

@ -167,20 +167,21 @@ void Button::_notification(int p_what) {
const int h_separation = MAX(0, theme_cache.h_separation); const int h_separation = MAX(0, theme_cache.h_separation);
float left_internal_margin_with_h_separation = _internal_margin[SIDE_LEFT];
float right_internal_margin_with_h_separation = _internal_margin[SIDE_RIGHT];
{ // The width reserved for internal element in derived classes (and h_separation if need). { // The width reserved for internal element in derived classes (and h_separation if need).
float internal_margin = _internal_margin[SIDE_LEFT] + _internal_margin[SIDE_RIGHT];
if (!xl_text.is_empty() || h_separation_is_valid_when_no_text) { if (!xl_text.is_empty() || h_separation_is_valid_when_no_text) {
if (_internal_margin[SIDE_LEFT] > 0.0f) { if (_internal_margin[SIDE_LEFT] > 0.0f) {
internal_margin += h_separation; left_internal_margin_with_h_separation += h_separation;
} }
if (_internal_margin[SIDE_RIGHT] > 0.0f) { if (_internal_margin[SIDE_RIGHT] > 0.0f) {
internal_margin += h_separation; right_internal_margin_with_h_separation += h_separation;
} }
} }
drawable_size_remained.width -= internal_margin; // The size after the internal element is stripped. drawable_size_remained.width -= left_internal_margin_with_h_separation + right_internal_margin_with_h_separation; // The size after the internal element is stripped.
} }
HorizontalAlignment icon_align_rtl_checked = horizontal_icon_alignment; HorizontalAlignment icon_align_rtl_checked = horizontal_icon_alignment;
@ -308,12 +309,12 @@ void Button::_notification(int p_what) {
case HORIZONTAL_ALIGNMENT_FILL: case HORIZONTAL_ALIGNMENT_FILL:
case HORIZONTAL_ALIGNMENT_LEFT: { case HORIZONTAL_ALIGNMENT_LEFT: {
icon_ofs.x += style_margin_left; icon_ofs.x += style_margin_left;
icon_ofs.x += _internal_margin[SIDE_LEFT]; icon_ofs.x += left_internal_margin_with_h_separation;
} break; } break;
case HORIZONTAL_ALIGNMENT_RIGHT: { case HORIZONTAL_ALIGNMENT_RIGHT: {
icon_ofs.x = size.x - style_margin_right; icon_ofs.x = size.x - style_margin_right;
icon_ofs.x -= _internal_margin[SIDE_RIGHT]; icon_ofs.x -= right_internal_margin_with_h_separation;
icon_ofs.x -= icon_size.width; icon_ofs.x -= icon_size.width;
} break; } break;
} }
@ -368,7 +369,7 @@ void Button::_notification(int p_what) {
case HORIZONTAL_ALIGNMENT_LEFT: case HORIZONTAL_ALIGNMENT_LEFT:
case HORIZONTAL_ALIGNMENT_RIGHT: { case HORIZONTAL_ALIGNMENT_RIGHT: {
text_ofs.x += style_margin_left; text_ofs.x += style_margin_left;
text_ofs.x += _internal_margin[SIDE_LEFT]; text_ofs.x += left_internal_margin_with_h_separation;
if (icon_align_rtl_checked == HORIZONTAL_ALIGNMENT_LEFT) { if (icon_align_rtl_checked == HORIZONTAL_ALIGNMENT_LEFT) {
// Offset by the space's width that occupied by icon and h_separation together. // Offset by the space's width that occupied by icon and h_separation together.
text_ofs.x += custom_element_size.width - drawable_size_remained.width; text_ofs.x += custom_element_size.width - drawable_size_remained.width;