diff options
| author | Andreas Haas | 2017-04-14 17:50:45 +0200 |
|---|---|---|
| committer | GitHub | 2017-04-14 17:50:45 +0200 |
| commit | 2e68d4b407e04fd2f0761404df8f382e5e9a58d9 (patch) | |
| tree | 6aeacdae7e3804b54bfbf0b3c2287da344316781 | |
| parent | d8ae244d51ed157d96346c510baeb637239e3200 (diff) | |
| parent | 21edeebfdbea38340b33ad45bd64ff19048ce80e (diff) | |
| download | godot-2e68d4b407e04fd2f0761404df8f382e5e9a58d9.tar.gz godot-2e68d4b407e04fd2f0761404df8f382e5e9a58d9.tar.zst godot-2e68d4b407e04fd2f0761404df8f382e5e9a58d9.zip | |
Merge pull request #8355 from volzhs/texture-view-2.1
Prevent to take too much space for long vertical texture (2.1)
Diffstat (limited to '')
| -rw-r--r-- | editor/property_editor.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 39ed889e9..17f28e13e 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -2062,6 +2062,10 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String &p RES res = obj->get(p_name).operator RefPtr(); if (res->is_type("Texture")) { int tw = EditorSettings::get_singleton()->get("property_editor/texture_preview_width"); + Vector2 size(res->call("get_width"), res->call("get_height")); + if (size.width < size.height) { + tw = MAX((size.width / size.height) * tw, 1); + } p_item->set_icon_max_width(1, tw); p_item->set_icon(1, res); p_item->set_text(1, ""); @@ -3206,6 +3210,10 @@ void PropertyEditor::update_tree() { if (res->is_type("Texture")) { int tw = EditorSettings::get_singleton()->get("property_editor/texture_preview_width"); + Vector2 size(res->call("get_width"), res->call("get_height")); + if (size.width < size.height) { + tw = MAX((size.width / size.height) * tw, 1); + } item->set_icon_max_width(1, tw); item->set_icon(1, res); item->set_text(1, ""); |