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

Merge pull request #17832 from YeldhamDev/popups_size_fix

Browse source 
Fixed some popups not shrinking their size back when losing items
This commit is contained in:
Rémi Verschelde 2018-04-03 23:53:47 +02:00 committed by GitHub
commit bcf5b748b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editor/plugins/animation_tree_editor_plugin.cpp
View file

@ -756,6 +756,7 @@ void AnimationTreeEditor::_gui_input(Ref<InputEvent> p_event) {
if (rclick_type == CLICK_INPUT_SLOT || rclick_type == CLICK_OUTPUT_SLOT) { if (rclick_type == CLICK_INPUT_SLOT || rclick_type == CLICK_OUTPUT_SLOT) {
node_popup->clear(); node_popup->clear();
node_popup->set_size(Size2(1, 1));
node_popup->add_item(TTR("Disconnect"), NODE_DISCONNECT); node_popup->add_item(TTR("Disconnect"), NODE_DISCONNECT);
if (anim_tree->node_get_type(rclick_node) == AnimationTreePlayer::NODE_TRANSITION) { if (anim_tree->node_get_type(rclick_node) == AnimationTreePlayer::NODE_TRANSITION) {
node_popup->add_item(TTR("Add Input"), NODE_ADD_INPUT); node_popup->add_item(TTR("Add Input"), NODE_ADD_INPUT);
@ -774,6 +775,7 @@ void AnimationTreeEditor::_gui_input(Ref<InputEvent> p_event) {
if (rclick_type == CLICK_NODE) { if (rclick_type == CLICK_NODE) {
node_popup->clear(); node_popup->clear();
node_popup->set_size(Size2(1, 1));
node_popup->add_item(TTR("Rename"), NODE_RENAME); node_popup->add_item(TTR("Rename"), NODE_RENAME);
node_popup->add_item(TTR("Remove"), NODE_ERASE); node_popup->add_item(TTR("Remove"), NODE_ERASE);
if (anim_tree->node_get_type(rclick_node) == AnimationTreePlayer::NODE_TRANSITION) if (anim_tree->node_get_type(rclick_node) == AnimationTreePlayer::NODE_TRANSITION)

1
editor/scene_tree_dock.cpp
View file

@ -1794,6 +1794,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
subresources.clear(); subresources.clear();
menu_subresources->clear(); menu_subresources->clear();
menu_subresources->set_size(Size2(1, 1));
_add_children_to_popup(selection.front()->get(), 0); _add_children_to_popup(selection.front()->get(), 0);
if (menu->get_item_count() > 0) if (menu->get_item_count() > 0)
menu->add_separator(); menu->add_separator();