godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #102603 from havi05/itemlist-fix-textoverrun-fixed-icon

Browse Source 
Itemlist: Fix `text_overrun` when using `fixed_icon_size`
This commit is contained in:
Thaddeus Crews
2025-02-10 12:21:34 -06:00
parent 4b644ed1f5 e43756c559
commit c89ded23a6
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scene/gui/item_list.cpp
View File

@@ -1282,10 +1282,8 @@ void ItemList::_notification(int p_what) {
} }
Vector2 text_ofs; Vector2 text_ofs;
if (items[i].icon.is_valid()) {
Size2 icon_size; Size2 icon_size;
//= _adjust_to_max_size(items[i].get_icon_size(),fixed_icon_size) * icon_scale; if (items[i].icon.is_valid()) {
if (fixed_icon_size.x > 0 && fixed_icon_size.y > 0) { if (fixed_icon_size.x > 0 && fixed_icon_size.y > 0) {
icon_size = fixed_icon_size * icon_scale; icon_size = fixed_icon_size * icon_scale;
} else { } else {
@@ -1417,14 +1415,14 @@ void ItemList::_notification(int p_what) {
text_ofs += base_ofs; text_ofs += base_ofs;
text_ofs += items[i].rect_cache.position; text_ofs += items[i].rect_cache.position;
float text_w = items[i].rect_cache.size.width - (items[i].get_icon_size().x * icon_scale) - MAX(theme_cache.h_separation, 0); float text_w = items[i].rect_cache.size.width - icon_size.x - MAX(theme_cache.h_separation, 0);
if (wraparound_items && items[i].rect_cache.size.width > width) { if (wraparound_items && items[i].rect_cache.size.width > width) {
text_w -= items[i].rect_cache.size.width - width; text_w -= items[i].rect_cache.size.width - width;
} }
items.write[i].text_buf->set_width(text_w); items.write[i].text_buf->set_width(text_w);
if (rtl) { if (rtl) {
text_ofs.x = size.width - items[i].rect_cache.size.width + (items[i].get_icon_size().x * icon_scale) - text_ofs.x + MAX(theme_cache.h_separation, 0); text_ofs.x = size.width - items[i].rect_cache.size.width + icon_size.x - text_ofs.x + MAX(theme_cache.h_separation, 0);
if (wraparound_items) { if (wraparound_items) {
text_ofs.x += MAX(items[i].rect_cache.size.width - width, 0); text_ofs.x += MAX(items[i].rect_cache.size.width - width, 0);
} }
@@ -1438,12 +1436,12 @@ void ItemList::_notification(int p_what) {
} }
if (fixed_column_width > 0) { if (fixed_column_width > 0) {
if (items[i].rect_cache.size.width - (items[i].get_icon_size().x * icon_scale) - MAX(theme_cache.h_separation, 0) > 0) { if (items[i].rect_cache.size.width - icon_size.x - MAX(theme_cache.h_separation, 0) > 0) {
items[i].text_buf->draw(get_canvas_item(), text_ofs, txt_modulate); items[i].text_buf->draw(get_canvas_item(), text_ofs, txt_modulate);
} }
} else { } else {
if (wraparound_items) { if (wraparound_items) {
if (width - (items[i].get_icon_size().x * icon_scale) - MAX(theme_cache.h_separation, 0) - int(scroll_bar_h->get_value()) > 0) { if (width - icon_size.x - MAX(theme_cache.h_separation, 0) - int(scroll_bar_h->get_value()) > 0) {
items[i].text_buf->draw(get_canvas_item(), text_ofs, txt_modulate); items[i].text_buf->draw(get_canvas_item(), text_ofs, txt_modulate);
} }
} else { } else {