diff options
| author | Rémi Verschelde | 2017-08-21 23:49:07 +0200 |
|---|---|---|
| committer | GitHub | 2017-08-21 23:49:07 +0200 |
| commit | e9c43cecbf9a75fe474a27011425ab072217d376 (patch) | |
| tree | f41a77b8e2d8c387af06927fb4a4e4c9077ff95a /editor/editor_node.cpp | |
| parent | d37bd15cb92295ef22731a2ab171d0647ff541db (diff) | |
| parent | 0c18009665cc24ccdace885a2385321b77c80943 (diff) | |
| download | godot-e9c43cecbf9a75fe474a27011425ab072217d376.tar.gz godot-e9c43cecbf9a75fe474a27011425ab072217d376.tar.zst godot-e9c43cecbf9a75fe474a27011425ab072217d376.zip | |
Merge pull request #10433 from djrm/pr_svg_support
SVG support
Diffstat (limited to 'editor/editor_node.cpp')
| -rw-r--r-- | editor/editor_node.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 6f29a8695..86964b3ca 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -336,7 +336,7 @@ void EditorNode::_notification(int p_what) { if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { scene_tabs->set_tab_close_display_policy((bool(EDITOR_DEF("interface/always_show_close_button_in_scene_tabs", false)) ? Tabs::CLOSE_BUTTON_SHOW_ALWAYS : Tabs::CLOSE_BUTTON_SHOW_ACTIVE_ONLY)); property_editor->set_enable_capitalize_paths(bool(EDITOR_DEF("interface/capitalize_properties", true))); - Ref<Theme> theme = create_editor_theme(); + Ref<Theme> theme = create_editor_theme(theme_base->get_theme()); theme_base->set_theme(theme); gui_base->add_style_override("panel", gui_base->get_stylebox("Background", "EditorStyles")); play_button_panel->add_style_override("panel", gui_base->get_stylebox("PlayButtonPanel", "EditorStyles")); @@ -5195,7 +5195,7 @@ EditorNode::EditorNode() { main_vbox = memnew(VBoxContainer); gui_base->add_child(main_vbox); main_vbox->set_area_as_parent_rect(8); - main_vbox->set_margin(MARGIN_TOP, 5); + main_vbox->set_margin(MARGIN_TOP, 5 * EDSCALE); menu_hb = memnew(HBoxContainer); main_vbox->add_child(menu_hb); @@ -5610,7 +5610,7 @@ EditorNode::EditorNode() { play_hb->add_child(stop_button); //stop_button->set_toggle_mode(true); stop_button->set_focus_mode(Control::FOCUS_NONE); - stop_button->set_icon(gui_base->get_icon("MainStop", "EditorIcons")); + stop_button->set_icon(gui_base->get_icon("Stop", "EditorIcons")); stop_button->connect("pressed", this, "_menu_option", make_binds(RUN_STOP)); stop_button->set_tooltip(TTR("Stop the scene.")); stop_button->set_shortcut(ED_SHORTCUT("editor/stop", TTR("Stop"), KEY_F8)); |