asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8356 from volzhs/texture-view-master

Browse source 
Prevent to take too much space for long vertical texture
This commit is contained in:
Andreas Haas 2017-04-14 17:50:29 +02:00 committed by GitHub
commit 4e7c5eb498
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editor/property_editor.cpp
View file

@ -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(); RES res = obj->get(p_name).operator RefPtr();
if (res->is_class("Texture")) { if (res->is_class("Texture")) {
int tw = EditorSettings::get_singleton()->get("docks/property_editor/texture_preview_width"); 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_max_width(1, tw);
p_item->set_icon(1, res); p_item->set_icon(1, res);
p_item->set_text(1, ""); p_item->set_text(1, "");
@ -3618,6 +3622,10 @@ void PropertyEditor::update_tree() {
if (res->is_class("Texture")) { if (res->is_class("Texture")) {
int tw = EditorSettings::get_singleton()->get("docks/property_editor/texture_preview_width"); 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_max_width(1, tw);
item->set_icon(1, res); item->set_icon(1, res);
item->set_text(1, ""); item->set_text(1, "");