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

Fixes icons in itemlist not working

Browse Source
This commit is contained in:
groud
2018-11-07 18:29:24 +01:00
parent de0d306558
commit 0ec448d21d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
editor/plugins/tile_map_editor_plugin.cpp
View File

@@ -1729,6 +1729,7 @@ void TileMapEditor::_rotate(int steps) {
transpose = mirrored_rotation_matrix[new_id][0]; transpose = mirrored_rotation_matrix[new_id][0];
flip_h = mirrored_rotation_matrix[new_id][1]; flip_h = mirrored_rotation_matrix[new_id][1];
flip_v = mirrored_rotation_matrix[new_id][2]; flip_v = mirrored_rotation_matrix[new_id][2];
break;
} }
} }
} else { } else {

6
scene/gui/item_list.cpp
View File

@@ -456,6 +456,9 @@ Size2 ItemList::Item::get_icon_size() const {
return Size2(); return Size2();
Size2 size_result = Size2(icon_region.size).abs(); Size2 size_result = Size2(icon_region.size).abs();
if (icon_region.size.x == 0 || icon_region.size.y == 0)
size_result = icon->get_size();
if (icon_transposed) { if (icon_transposed) {
Size2 size_tmp = size_result; Size2 size_tmp = size_result;
size_result.x = size_tmp.y; size_result.x = size_tmp.y;
@@ -1098,7 +1101,8 @@ void ItemList::_notification(int p_what) {
draw_rect.size.y = size_tmp.x; draw_rect.size.y = size_tmp.x;
} }
draw_texture_rect_region(items[i].icon, draw_rect, items[i].icon_region, modulate, items[i].icon_transposed); Rect2 region = (items[i].icon_region.size.x == 0 || items[i].icon_region.size.y == 0) ? Rect2(Vector2(), items[i].icon->get_size()) : Rect2(items[i].icon_region);
draw_texture_rect_region(items[i].icon, draw_rect, region, modulate, items[i].icon_transposed);
} }
if (items[i].tag_icon.is_valid()) { if (items[i].tag_icon.is_valid()) {