Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a h_separation between icons in CheckButton/CheckBox #88615

Merged
merged 1 commit into from
Feb 26, 2024
Merged

Add a h_separation between icons in CheckButton/CheckBox #88615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions scene/gui/button.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ void Button::_set_internal_margin(Side p_side, float p_value) {
void Button::_queue_update_size_cache() {
}

void Button::_set_h_separation_is_valid_when_no_text(bool p_h_separation_is_valid_when_no_text) {
h_separation_is_valid_when_no_text = p_h_separation_is_valid_when_no_text;
}

Ref<StyleBox> Button::_get_current_stylebox() const {
Ref<StyleBox> stylebox = theme_cache.normal;
const bool rtl = is_layout_rtl();
Expand Down Expand Up @@ -171,14 +167,12 @@ void Button::_notification(int p_what) {
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).

if (!xl_text.is_empty() || h_separation_is_valid_when_no_text) {
if (_internal_margin[SIDE_LEFT] > 0.0f) {
left_internal_margin_with_h_separation += h_separation;
}
if (_internal_margin[SIDE_LEFT] > 0.0f) {
left_internal_margin_with_h_separation += h_separation;
}

if (_internal_margin[SIDE_RIGHT] > 0.0f) {
right_internal_margin_with_h_separation += h_separation;
}
if (_internal_margin[SIDE_RIGHT] > 0.0f) {
right_internal_margin_with_h_separation += h_separation;
}

drawable_size_remained.width -= left_internal_margin_with_h_separation + right_internal_margin_with_h_separation; // The size after the internal element is stripped.
Expand Down
3 changes: 0 additions & 3 deletions scene/gui/button.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ class Button : public BaseButton {
VerticalAlignment vertical_icon_alignment = VERTICAL_ALIGNMENT_CENTER;
float _internal_margin[4] = {};

bool h_separation_is_valid_when_no_text = false;

struct ThemeCache {
Ref<StyleBox> normal;
Ref<StyleBox> normal_mirrored;
Expand Down Expand Up @@ -104,7 +102,6 @@ class Button : public BaseButton {
void _set_internal_margin(Side p_side, float p_value);
virtual void _queue_update_size_cache();

void _set_h_separation_is_valid_when_no_text(bool p_h_separation_is_valid_when_no_text);
Ref<StyleBox> _get_current_stylebox() const;
void _notification(int p_what);
static void _bind_methods();
Expand Down
16 changes: 11 additions & 5 deletions scene/gui/check_box.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,18 @@ Size2 CheckBox::get_icon_size() const {

Size2 CheckBox::get_minimum_size() const {
Size2 minsize = Button::get_minimum_size();
Size2 tex_size = get_icon_size();
minsize.width += tex_size.width;
if (get_text().length() > 0) {
minsize.width += MAX(0, theme_cache.h_separation);
const Size2 tex_size = get_icon_size();
if (tex_size.width > 0 || tex_size.height > 0) {
const Size2 padding = _get_current_stylebox()->get_minimum_size();
Size2 content_size = minsize - padding;
if (content_size.width > 0 && tex_size.width > 0) {
content_size.width += MAX(0, theme_cache.h_separation);
}
content_size.width += tex_size.width;
content_size.height = MAX(content_size.height, tex_size.height);

minsize = content_size + padding;
}
minsize.height = MAX(minsize.height, tex_size.height + theme_cache.normal_style->get_margin(SIDE_TOP) + theme_cache.normal_style->get_margin(SIDE_BOTTOM));

return minsize;
}
Expand Down
16 changes: 11 additions & 5 deletions scene/gui/check_button.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,18 @@ Size2 CheckButton::get_icon_size() const {

Size2 CheckButton::get_minimum_size() const {
Size2 minsize = Button::get_minimum_size();
Size2 tex_size = get_icon_size();
minsize.width += tex_size.width;
if (get_text().length() > 0) {
minsize.width += MAX(0, theme_cache.h_separation);
const Size2 tex_size = get_icon_size();
if (tex_size.width > 0 || tex_size.height > 0) {
const Size2 padding = _get_current_stylebox()->get_minimum_size();
Size2 content_size = minsize - padding;
if (content_size.width > 0 && tex_size.width > 0) {
content_size.width += MAX(0, theme_cache.h_separation);
}
content_size.width += tex_size.width;
content_size.height = MAX(content_size.height, tex_size.height);

minsize = content_size + padding;
}
minsize.height = MAX(minsize.height, tex_size.height + theme_cache.normal_style->get_margin(SIDE_TOP) + theme_cache.normal_style->get_margin(SIDE_BOTTOM));

return minsize;
}
Expand Down
2 changes: 0 additions & 2 deletions scene/gui/option_button.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,6 @@ void OptionButton::set_disable_shortcuts(bool p_disabled) {

OptionButton::OptionButton(const String &p_text) :
Button(p_text) {
_set_h_separation_is_valid_when_no_text(true);

set_toggle_mode(true);
set_process_shortcut_input(true);
set_text_alignment(HORIZONTAL_ALIGNMENT_LEFT);
Expand Down
Loading