From c3e6759ca1324447b8d51362e622f3a19403cb4e Mon Sep 17 00:00:00 2001 From: volzhs Date: Tue, 11 Apr 2017 20:22:57 +0900 Subject: [PATCH] Prevent to take too much space for long vertical texture --- editor/property_editor.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 86136fa78b2..77de27a6519 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -2388,6 +2388,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_class("Texture")) { int tw = EditorSettings::get_singleton()->get("docks/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, ""); @@ -3618,6 +3622,10 @@ void PropertyEditor::update_tree() { if (res->is_class("Texture")) { int tw = EditorSettings::get_singleton()->get("docks/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, "");