diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-20 09:29:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 09:29:08 +0200 |
| commit | a650908cf4b3c365b9fb8c5709d4754440376380 (patch) | |
| tree | 8d91933d72fb64c938a060191ad3f26bf480b282 | |
| parent | cd2ffdc6725aa6f7a9a4af6fd5abcc4cafae61b4 (diff) | |
| parent | cd81ef4d38a88e511b90c57c3b980b1e63733829 (diff) | |
Merge pull request #11435 from volzhs/remove-show-button-name-on-off
Show button name always in main toolbar
[ci skip]
| -rw-r--r-- | editor/editor_node.cpp | 18 | ||||
| -rw-r--r-- | editor/editor_node.h | 1 |
2 files changed, 0 insertions, 19 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 1a89d6ef6e..54c6ff79ea 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -4426,22 +4426,6 @@ void EditorNode::_dim_timeout() { } } -void EditorNode::_check_gui_base_size() { - if (gui_base->get_size().width > 1200 * EDSCALE) { - for (int i = 0; i < singleton->main_editor_button_vb->get_child_count(); i++) { - ToolButton *btn = Object::cast_to<ToolButton>(singleton->main_editor_button_vb->get_child(i)); - if (btn == singleton->distraction_free) continue; - btn->set_text(btn->get_name()); - } - } else { - for (int i = 0; i < singleton->main_editor_button_vb->get_child_count(); i++) { - ToolButton *btn = Object::cast_to<ToolButton>(singleton->main_editor_button_vb->get_child(i)); - if (btn == singleton->distraction_free) continue; - btn->set_text(""); - } - } -} - void EditorNode::open_export_template_manager() { export_template_manager->popup_manager(); @@ -4521,7 +4505,6 @@ void EditorNode::_bind_methods() { ClassDB::bind_method(D_METHOD("_open_imported"), &EditorNode::_open_imported); ClassDB::bind_method(D_METHOD("_inherit_imported"), &EditorNode::_inherit_imported); ClassDB::bind_method(D_METHOD("_dim_timeout"), &EditorNode::_dim_timeout); - ClassDB::bind_method(D_METHOD("_check_gui_base_size"), &EditorNode::_check_gui_base_size); ClassDB::bind_method(D_METHOD("_resources_reimported"), &EditorNode::_resources_reimported); @@ -4671,7 +4654,6 @@ EditorNode::EditorNode() { gui_base = memnew(Panel); theme_base->add_child(gui_base); gui_base->set_area_as_parent_rect(); - gui_base->connect("item_rect_changed", this, "_check_gui_base_size"); Ref<Theme> theme = create_editor_theme(); theme_base->set_theme(theme); diff --git a/editor/editor_node.h b/editor/editor_node.h index 33031e5634..e7853a27ba 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -605,7 +605,6 @@ private: void _start_dimming(bool p_dimming); void _dim_timeout(); - void _check_gui_base_size(); void _license_tree_selected(); |