diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-27 22:15:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 22:15:00 +0200 |
| commit | da144fed4c49133a93b3b83cfc665352c0af351a (patch) | |
| tree | e3ee2e13f9c0664e2c9fa8474fbf7ae9a1fbb5c1 /editor | |
| parent | 78423320d78235a5b2fde05e7816f79de729f317 (diff) | |
| parent | bd8a5fba30510558ce34f6a863567d668524f5b3 (diff) | |
Merge pull request #11617 from groud/fix_bad_display
Fixes bad display
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/animation_editor.cpp | 1 | ||||
| -rw-r--r-- | editor/editor_help.cpp | 1 | ||||
| -rw-r--r-- | editor/editor_log.cpp | 1 | ||||
| -rw-r--r-- | editor/editor_node.cpp | 3 | ||||
| -rw-r--r-- | editor/project_settings_editor.cpp | 1 |
5 files changed, 0 insertions, 7 deletions
diff --git a/editor/animation_editor.cpp b/editor/animation_editor.cpp index 3b1a7b6665..b832b993bb 100644 --- a/editor/animation_editor.cpp +++ b/editor/animation_editor.cpp @@ -3936,7 +3936,6 @@ AnimationKeyEditor::AnimationKeyEditor() { key_editor_tab->set_custom_minimum_size(Size2(200, 0) * EDSCALE); key_editor = memnew(PropertyEditor); - key_editor->set_anchors_and_margins_preset(Control::PRESET_WIDE); key_editor->hide_top_label(); key_editor->set_name(TTR("Key")); key_editor_tab->add_child(key_editor); diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 80e6f9807e..f2452df9f0 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -1790,7 +1790,6 @@ EditorHelp::EditorHelp() { { class_desc = memnew(RichTextLabel); vbc->add_child(class_desc); - class_desc->set_anchors_and_margins_preset(Control::PRESET_WIDE); class_desc->set_v_size_flags(SIZE_EXPAND_FILL); class_desc->add_color_override("selection_color", EDITOR_DEF("text_editor/highlighting/selection_color", Color(0.2, 0.2, 1))); class_desc->connect("meta_clicked", this, "_class_desc_select"); diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 46f8baa4c5..407420d3d0 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -161,7 +161,6 @@ EditorLog::EditorLog() { log->set_selection_enabled(true); log->set_focus_mode(FOCUS_CLICK); log->set_custom_minimum_size(Size2(0, 180) * EDSCALE); - log->set_anchors_and_margins_preset(Control::PRESET_WIDE); log->set_v_size_flags(SIZE_EXPAND_FILL); log->set_h_size_flags(SIZE_EXPAND_FILL); vb->add_child(log); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 3069ba97f2..21520875cd 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -5083,9 +5083,6 @@ EditorNode::EditorNode() { play_cc = memnew(CenterContainer); play_cc->set_mouse_filter(Control::MOUSE_FILTER_IGNORE); menu_hb->add_child(play_cc); - play_cc->set_anchors_and_margins_preset(Control::PRESET_WIDE); - play_cc->set_anchor_and_margin(MARGIN_BOTTOM, Control::ANCHOR_BEGIN, 10); - play_cc->set_margin(MARGIN_TOP, 5); play_button_panel = memnew(PanelContainer); // play_button_panel->add_style_override("panel", gui_base->get_stylebox("PlayButtonPanel", "EditorStyles")); diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 34c0d7e578..56e593e34b 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -1504,7 +1504,6 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { Control *input_base = memnew(Control); input_base->set_name(TTR("Input Map")); - input_base->set_anchors_and_margins_preset(Control::PRESET_WIDE); tab_container->add_child(input_base); VBoxContainer *vbc = memnew(VBoxContainer); |