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

Fix huge .tscn icon and icon in background of File System panel #92669

Merged
merged 1 commit into from
Jun 3, 2024
Merged

Fix huge .tscn icon and icon in background of File System panel #92669

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
3 changes: 3 additions & 0 deletions editor/filesystem_dock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,9 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
files->set_max_text_lines(2);
files->set_fixed_icon_size(Size2(thumbnail_size, thumbnail_size));

const int icon_size = get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor));
files->set_fixed_tag_icon_size(Size2(icon_size, icon_size));

if (thumbnail_size < 64) {
folder_thumbnail = get_editor_theme_icon(SNAME("FolderMediumThumb"));
file_thumbnail = get_editor_theme_icon(SNAME("FileMediumThumb"));
Expand Down
22 changes: 20 additions & 2 deletions scene/gui/item_list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,16 @@ Size2 ItemList::Item::get_icon_size() const {
return size_result;
}

void ItemList::set_fixed_tag_icon_size(const Size2i &p_size) {
if (fixed_tag_icon_size == p_size) {
return;
}

fixed_tag_icon_size = p_size;
queue_redraw();
shape_changed = true;
}

void ItemList::gui_input(const Ref<InputEvent> &p_event) {
ERR_FAIL_COND(p_event.is_null());

Expand Down Expand Up @@ -1225,13 +1235,21 @@ void ItemList::_notification(int p_what) {
}

if (items[i].tag_icon.is_valid()) {
Size2 tag_icon_size;
if (fixed_tag_icon_size.x > 0 && fixed_tag_icon_size.y > 0) {
tag_icon_size = fixed_tag_icon_size;
} else {
tag_icon_size = items[i].tag_icon->get_size();
}

Point2 draw_pos = items[i].rect_cache.position;
draw_pos.x += theme_cache.h_separation / 2;
draw_pos.y += theme_cache.v_separation / 2;
if (rtl) {
draw_pos.x = size.width - draw_pos.x - items[i].tag_icon->get_width();
draw_pos.x = size.width - draw_pos.x - tag_icon_size.x;
}
draw_texture(items[i].tag_icon, draw_pos + base_ofs);

draw_texture_rect(items[i].tag_icon, Rect2(draw_pos + base_ofs, tag_icon_size));
}

if (!items[i].text.is_empty()) {
Expand Down
3 changes: 3 additions & 0 deletions scene/gui/item_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ class ItemList : public Control {

Size2 fixed_icon_size;
Size2 max_item_size_cache;
Size2 fixed_tag_icon_size;

int defer_select_single = -1;
bool allow_rmb_select = false;
Expand Down Expand Up @@ -261,6 +262,8 @@ class ItemList : public Control {
void set_fixed_icon_size(const Size2i &p_size);
Size2i get_fixed_icon_size() const;

void set_fixed_tag_icon_size(const Size2i &p_size);

void set_allow_rmb_select(bool p_allow);
bool get_allow_rmb_select() const;

Expand Down
Loading