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

Merge pull request #96276 from KoBeWi/deprecated_on_arrival

Browse source 
Deprecate `set_min_buttons_width_from_icons`
This commit is contained in:
Rémi Verschelde 2024-09-06 10:09:24 +02:00
commit 1476578a5c
No known key found for this signature in database
GPG key ID: C3336907360768E1
5 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/classes/SpinBox.xml
View file

@ -98,12 +98,12 @@
Vertical separation between the up and down buttons. Vertical separation between the up and down buttons.
</theme_item> </theme_item>
<theme_item name="buttons_width" data_type="constant" type="int" default="16"> <theme_item name="buttons_width" data_type="constant" type="int" default="16">
Width of the up and down buttons. If smaller than any icon set on the buttons, the respective icon may overlap neighboring elements, unless [theme_item set_min_buttons_width_from_icons] is different than [code]0[/code]. Width of the up and down buttons. If smaller than any icon set on the buttons, the respective icon may overlap neighboring elements. If smaller than [code]0[/code], the width is automatically adjusted from the icon size.
</theme_item> </theme_item>
<theme_item name="field_and_buttons_separation" data_type="constant" type="int" default="2"> <theme_item name="field_and_buttons_separation" data_type="constant" type="int" default="2">
Width of the horizontal separation between the text input field ([LineEdit]) and the buttons. Width of the horizontal separation between the text input field ([LineEdit]) and the buttons.
</theme_item> </theme_item>
<theme_item name="set_min_buttons_width_from_icons" data_type="constant" type="int" default="1"> <theme_item name="set_min_buttons_width_from_icons" data_type="constant" type="int" default="1" deprecated="This property exists only for compatibility with older themes. Setting [theme_item buttons_width] to a negative value has the same effect.">
If not [code]0[/code], the minimum button width corresponds to the widest of all icons set on those buttons, even if [theme_item buttons_width] is smaller. If not [code]0[/code], the minimum button width corresponds to the widest of all icons set on those buttons, even if [theme_item buttons_width] is smaller.
</theme_item> </theme_item>
<theme_item name="down" data_type="icon" type="Texture2D"> <theme_item name="down" data_type="icon" type="Texture2D">

2
editor/themes/editor_theme_manager.cpp
View file

@ -1507,7 +1507,9 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
p_theme->set_constant("buttons_vertical_separation", "SpinBox", 0); p_theme->set_constant("buttons_vertical_separation", "SpinBox", 0);
p_theme->set_constant("field_and_buttons_separation", "SpinBox", 2); p_theme->set_constant("field_and_buttons_separation", "SpinBox", 2);
p_theme->set_constant("buttons_width", "SpinBox", 16); p_theme->set_constant("buttons_width", "SpinBox", 16);
#ifndef DISABLE_DEPRECATED
p_theme->set_constant("set_min_buttons_width_from_icons", "SpinBox", 1); p_theme->set_constant("set_min_buttons_width_from_icons", "SpinBox", 1);
#endif
} }
// ProgressBar. // ProgressBar.

9
scene/gui/spin_box.cpp
View file

@ -287,7 +287,12 @@ inline void SpinBox::_compute_sizes() {
int buttons_block_wanted_width = theme_cache.buttons_width + theme_cache.field_and_buttons_separation; int buttons_block_wanted_width = theme_cache.buttons_width + theme_cache.field_and_buttons_separation;
int buttons_block_icon_enforced_width = _get_widest_button_icon_width() + theme_cache.field_and_buttons_separation; int buttons_block_icon_enforced_width = _get_widest_button_icon_width() + theme_cache.field_and_buttons_separation;
int w = theme_cache.set_min_buttons_width_from_icons != 0 ? MAX(buttons_block_icon_enforced_width, buttons_block_wanted_width) : buttons_block_wanted_width; #ifndef DISABLE_DEPRECATED
const bool min_width_from_icons = theme_cache.set_min_buttons_width_from_icons || (theme_cache.buttons_width < 0);
#else
const bool min_width_from_icons = theme_cache.buttons_width < 0;
#endif
int w = min_width_from_icons != 0 ? MAX(buttons_block_icon_enforced_width, buttons_block_wanted_width) : buttons_block_wanted_width;
if (w != sizing_cache.buttons_block_width) { if (w != sizing_cache.buttons_block_width) {
line_edit->set_offset(SIDE_LEFT, 0); line_edit->set_offset(SIDE_LEFT, 0);
@ -551,7 +556,9 @@ void SpinBox::_bind_methods() {
BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, SpinBox, buttons_vertical_separation); BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, SpinBox, buttons_vertical_separation);
BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, SpinBox, field_and_buttons_separation); BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, SpinBox, field_and_buttons_separation);
BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, SpinBox, buttons_width); BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, SpinBox, buttons_width);
#ifndef DISABLE_DEPRECATED
BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, SpinBox, set_min_buttons_width_from_icons); BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, SpinBox, set_min_buttons_width_from_icons);
#endif
BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, SpinBox, updown_icon, "updown"); BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, SpinBox, updown_icon, "updown");
BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, SpinBox, up_icon, "up"); BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, SpinBox, up_icon, "up");

5
scene/gui/spin_box.h
View file

@ -127,8 +127,9 @@ class SpinBox : public Range {
int buttons_vertical_separation = 0; int buttons_vertical_separation = 0;
int field_and_buttons_separation = 0; int field_and_buttons_separation = 0;
int buttons_width = 0; int buttons_width = 0;
int set_min_buttons_width_from_icons = 0; #ifndef DISABLE_DEPRECATED
bool set_min_buttons_width_from_icons = false;
#endif
} theme_cache; } theme_cache;
void _mouse_exited(); void _mouse_exited();

2
scene/theme/default_theme.cpp
View file

@ -648,7 +648,9 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
theme->set_constant("buttons_vertical_separation", "SpinBox", 0); theme->set_constant("buttons_vertical_separation", "SpinBox", 0);
theme->set_constant("field_and_buttons_separation", "SpinBox", 2); theme->set_constant("field_and_buttons_separation", "SpinBox", 2);
theme->set_constant("buttons_width", "SpinBox", 16); theme->set_constant("buttons_width", "SpinBox", 16);
#ifndef DISABLE_DEPRECATED
theme->set_constant("set_min_buttons_width_from_icons", "SpinBox", 1); theme->set_constant("set_min_buttons_width_from_icons", "SpinBox", 1);
#endif
// ScrollContainer // ScrollContainer