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

Merge pull request #4065 from TheHX/issue-4058

Browse source 
Fix editors panels, of the bottom panel, not resizing in some cases
This commit is contained in:
Rémi Verschelde 2016-03-16 13:34:42 +01:00
commit 5b67305ebb
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/editor/plugins/animation_player_editor_plugin.cpp
View file

@ -1500,7 +1500,8 @@ bool AnimationPlayerEditorPlugin::handles(Object *p_object) const {
void AnimationPlayerEditorPlugin::make_visible(bool p_visible) { void AnimationPlayerEditorPlugin::make_visible(bool p_visible) {
if (p_visible) { if (p_visible) {
anim_editor->show();
editor->make_bottom_panel_item_visible(anim_editor);
anim_editor->set_process(true); anim_editor->set_process(true);
anim_editor->ensure_visibility(); anim_editor->ensure_visibility();
// editor->animation_panel_make_visible(true); // editor->animation_panel_make_visible(true);

1
tools/editor/plugins/style_box_editor_plugin.cpp
View file

@ -92,6 +92,7 @@ void StyleBoxEditorPlugin::make_visible(bool p_visible){
if (p_visible) { if (p_visible) {
button->show(); button->show();
EditorNode::get_singleton()->make_bottom_panel_item_visible(stylebox_editor);
} else { } else {
if (stylebox_editor->is_visible()) if (stylebox_editor->is_visible())

6
tools/editor/plugins/theme_editor_plugin.cpp
View file

@ -833,10 +833,12 @@ void ThemeEditorPlugin::make_visible(bool p_visible){
if (p_visible) { if (p_visible) {
theme_editor->set_process(true); theme_editor->set_process(true);
button->show(); button->show();
editor->make_bottom_panel_item_visible(theme_editor);
} else { } else {
theme_editor->set_process(false); theme_editor->set_process(false);
if (theme_editor->is_visible()) if (theme_editor->is_visible())
EditorNode::get_singleton()->hide_bottom_panel(); editor->hide_bottom_panel();
button->hide(); button->hide();
} }
} }
@ -848,7 +850,7 @@ ThemeEditorPlugin::ThemeEditorPlugin(EditorNode *p_node) {
theme_editor->set_custom_minimum_size(Size2(0,500)); theme_editor->set_custom_minimum_size(Size2(0,500));
// p_node->get_viewport()->add_child(theme_editor); // p_node->get_viewport()->add_child(theme_editor);
button=EditorNode::get_singleton()->add_bottom_panel_item("Theme",theme_editor); button=editor->add_bottom_panel_item("Theme",theme_editor);
button->hide(); button->hide();