Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #93270 from Gamemap/feature-itemlist-autowidth

Browse Source 
Add `Auto width` behavior to ItemList
This commit is contained in:
Rémi Verschelde 2024-10-04 11:21:14 +02:00
commit 058f06c10d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/ItemList.xml
View File

@ -379,6 +379,9 @@
<member name="auto_height" type="bool" setter="set_auto_height" getter="has_auto_height" default="false">
If [code]true[/code], the control will automatically resize the height to fit its content.
</member>
<member name="auto_width" type="bool" setter="set_auto_width" getter="has_auto_width" default="false">
If [code]true[/code], the control will automatically resize the width to fit its content.
</member>
<member name="clip_contents" type="bool" setter="set_clip_contents" getter="is_clipping_contents" overrides="Control" default="true" />
<member name="fixed_column_width" type="int" setter="set_fixed_column_width" getter="get_fixed_column_width" default="0">
The width all columns will be adjusted to.

37
scene/gui/item_list.cpp
View File

@ -1446,12 +1446,13 @@ void ItemList::force_update_list_size() {
bool all_fit = true;
Vector2 ofs;
int col = 0;
int max_w = 0;
int max_h = 0;
separators.clear();
for (int i = 0; i < items.size(); i++) {
if (current_columns > 1 && items[i].rect_cache.size.width + ofs.x > fit_size) {
if (current_columns > 1 && items[i].rect_cache.size.width + ofs.x > fit_size && !auto_width) {
// Went past.
current_columns = MAX(col, 1);
all_fit = false;
@ -1477,6 +1478,7 @@ void ItemList::force_update_list_size() {
items.write[j].rect_cache.size.y = max_h;
}
max_w = MAX(max_w, ofs.x);
ofs.x = 0;
ofs.y += max_h;
col = 0;
@ -1498,12 +1500,16 @@ void ItemList::force_update_list_size() {
if (auto_height) {
auto_height_value = ofs.y + max_h + theme_cache.panel_style->get_minimum_size().height;
}
if (auto_width) {
auto_width_value = max_w + theme_cache.panel_style->get_minimum_size().width;
}
scroll_bar->set_max(max);
scroll_bar->set_page(page);
if (max <= page) {
scroll_bar->set_value(0);
scroll_bar->hide();
} else {
auto_width_value += scroll_bar_minwidth;
scroll_bar->show();
if (do_autoscroll_to_bottom) {
@ -1704,16 +1710,35 @@ bool ItemList::is_anything_selected() {
}
Size2 ItemList::get_minimum_size() const {
if (auto_height) {
return Size2(0, auto_height_value);
Size2 min_size;
if (auto_width) {
min_size.x = auto_width_value;
}
return Size2();
if (auto_height) {
min_size.y = auto_height_value;
}
return min_size;
}
void ItemList::set_autoscroll_to_bottom(const bool p_enable) {
do_autoscroll_to_bottom = p_enable;
}
void ItemList::set_auto_width(bool p_enable) {
if (auto_width == p_enable) {
return;
}
auto_width = p_enable;
shape_changed = true;
queue_redraw();
}
bool ItemList::has_auto_width() const {
return auto_width;
}
void ItemList::set_auto_height(bool p_enable) {
if (auto_height == p_enable) {
return;
@ -1869,6 +1894,9 @@ void ItemList::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_allow_search", "allow"), &ItemList::set_allow_search);
ClassDB::bind_method(D_METHOD("get_allow_search"), &ItemList::get_allow_search);
ClassDB::bind_method(D_METHOD("set_auto_width", "enable"), &ItemList::set_auto_width);
ClassDB::bind_method(D_METHOD("has_auto_width"), &ItemList::has_auto_width);
ClassDB::bind_method(D_METHOD("set_auto_height", "enable"), &ItemList::set_auto_height);
ClassDB::bind_method(D_METHOD("has_auto_height"), &ItemList::has_auto_height);
@ -1890,6 +1918,7 @@ void ItemList::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_rmb_select"), "set_allow_rmb_select", "get_allow_rmb_select");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_search"), "set_allow_search", "get_allow_search");
ADD_PROPERTY(PropertyInfo(Variant::INT, "max_text_lines", PROPERTY_HINT_RANGE, "1,10,1,or_greater"), "set_max_text_lines", "get_max_text_lines");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "auto_width"), "set_auto_width", "has_auto_width");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "auto_height"), "set_auto_height", "has_auto_height");
ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis,Word Ellipsis"), "set_text_overrun_behavior", "get_text_overrun_behavior");
ADD_ARRAY_COUNT("Items", "item_count", "set_item_count", "get_item_count", "item_");

6
scene/gui/item_list.h
View File

@ -100,6 +100,9 @@ private:
bool same_column_width = false;
bool allow_search = true;
bool auto_width = false;
float auto_width_value = 0.0;
bool auto_height = false;
float auto_height_value = 0.0;
@ -291,6 +294,9 @@ public:
void set_icon_scale(real_t p_scale);
real_t get_icon_scale() const;
void set_auto_width(bool p_enable);
bool has_auto_width() const;
void set_auto_height(bool p_enable);
bool has_auto_height() const;