From a3c2d9a6bdbe3967c8f747e39b2b581729b492c1 Mon Sep 17 00:00:00 2001 From: "Daniel J. Ramirez" Date: Fri, 14 Jul 2017 23:40:17 -0500 Subject: Improvements and fixes for the default theme. Added customizable border size and window highlight. --- editor/asset_library_editor_plugin.cpp | 17 +- editor/editor_node.cpp | 5 +- editor/editor_settings.cpp | 9 +- editor/editor_themes.cpp | 232 +++++++++++++-------- editor/icons/2x/icon_GUI_checked.png | Bin 0 -> 516 bytes editor/icons/2x/icon_GUI_dropdown.png | Bin 0 -> 183 bytes editor/icons/2x/icon_GUI_hslider_bg.png | Bin 0 -> 124 bytes editor/icons/2x/icon_GUI_hsplitter.png | Bin 0 -> 190 bytes editor/icons/2x/icon_GUI_option_arrow.png | Bin 0 -> 304 bytes editor/icons/2x/icon_GUI_play_button_group.png | Bin 0 -> 886 bytes editor/icons/2x/icon_GUI_progress_bar.png | Bin 0 -> 289 bytes editor/icons/2x/icon_GUI_progress_fill.png | Bin 0 -> 196 bytes editor/icons/2x/icon_GUI_scroll_bg.png | Bin 0 -> 99 bytes editor/icons/2x/icon_GUI_scroll_grabber.png | Bin 0 -> 193 bytes editor/icons/2x/icon_GUI_scroll_grabber_hl.png | Bin 0 -> 297 bytes editor/icons/2x/icon_GUI_slider_grabber.png | Bin 0 -> 260 bytes editor/icons/2x/icon_GUI_slider_grabber_hl.png | Bin 0 -> 1040 bytes editor/icons/2x/icon_GUI_spinbox_updown.png | Bin 0 -> 516 bytes editor/icons/2x/icon_GUI_tab_menu.png | Bin 0 -> 221 bytes editor/icons/2x/icon_GUI_toggle_off.png | Bin 0 -> 2606 bytes editor/icons/2x/icon_GUI_toggle_on.png | Bin 0 -> 2178 bytes editor/icons/2x/icon_GUI_tree_arrow_down.png | Bin 0 -> 256 bytes editor/icons/2x/icon_GUI_tree_arrow_right.png | Bin 0 -> 263 bytes editor/icons/2x/icon_GUI_unchecked.png | Bin 0 -> 369 bytes editor/icons/2x/icon_GUI_vslider_bg.png | Bin 0 -> 131 bytes editor/icons/2x/icon_GUI_vsplit_bg.png | Bin 0 -> 104 bytes editor/icons/2x/icon_GUI_vsplitter.png | Bin 0 -> 168 bytes editor/icons/2x/icon_gui_close_dark.png | Bin 0 -> 371 bytes editor/icons/2x/icon_gui_close_light.png | Bin 0 -> 366 bytes editor/icons/2x/icon_help.png | Bin 1126 -> 654 bytes editor/icons/2x/icon_help_search.png | Bin 0 -> 881 bytes editor/icons/icon_GUI_checked.png | Bin 0 -> 341 bytes editor/icons/icon_GUI_dropdown.png | Bin 0 -> 130 bytes editor/icons/icon_GUI_hslider_bg.png | Bin 0 -> 105 bytes editor/icons/icon_GUI_hsplitter.png | Bin 0 -> 132 bytes editor/icons/icon_GUI_option_arrow.png | Bin 0 -> 205 bytes editor/icons/icon_GUI_play_button_group.png | Bin 0 -> 427 bytes editor/icons/icon_GUI_progress_bar.png | Bin 0 -> 183 bytes editor/icons/icon_GUI_progress_fill.png | Bin 0 -> 139 bytes editor/icons/icon_GUI_scroll_bg.png | Bin 0 -> 90 bytes editor/icons/icon_GUI_scroll_grabber.png | Bin 0 -> 147 bytes editor/icons/icon_GUI_scroll_grabber_hl.png | Bin 0 -> 176 bytes editor/icons/icon_GUI_slider_grabber.png | Bin 0 -> 168 bytes editor/icons/icon_GUI_slider_grabber_hl.png | Bin 0 -> 477 bytes editor/icons/icon_GUI_spinbox_updown.png | Bin 0 -> 345 bytes editor/icons/icon_GUI_tab_menu.png | Bin 0 -> 146 bytes editor/icons/icon_GUI_toggle_off.png | Bin 0 -> 1143 bytes editor/icons/icon_GUI_toggle_on.png | Bin 0 -> 1030 bytes editor/icons/icon_GUI_tree_arrow_down.png | Bin 0 -> 170 bytes editor/icons/icon_GUI_tree_arrow_right.png | Bin 0 -> 189 bytes editor/icons/icon_GUI_unchecked.png | Bin 0 -> 231 bytes editor/icons/icon_GUI_vslider_bg.png | Bin 0 -> 108 bytes editor/icons/icon_GUI_vsplit_bg.png | Bin 0 -> 96 bytes editor/icons/icon_GUI_vsplitter.png | Bin 0 -> 122 bytes editor/icons/icon_gui_close_dark.png | Bin 0 -> 171 bytes editor/icons/icon_gui_close_light.png | Bin 0 -> 216 bytes editor/icons/icon_help.png | Bin 578 -> 353 bytes editor/icons/icon_help_search.png | Bin 0 -> 431 bytes editor/icons/source/icon_GUI_checked.svg | 79 +++++++ editor/icons/source/icon_GUI_dropdown.svg | 93 +++++++++ editor/icons/source/icon_GUI_hslider_bg.svg | 83 ++++++++ editor/icons/source/icon_GUI_hsplitter.svg | 79 +++++++ editor/icons/source/icon_GUI_option_arrow.svg | 80 +++++++ editor/icons/source/icon_GUI_play_button_group.svg | 78 +++++++ editor/icons/source/icon_GUI_progress_bar.svg | 81 +++++++ editor/icons/source/icon_GUI_progress_fill.svg | 83 ++++++++ editor/icons/source/icon_GUI_scroll_bg.svg | 71 +++++++ editor/icons/source/icon_GUI_scroll_grabber.svg | 78 +++++++ editor/icons/source/icon_GUI_scroll_grabber_hl.svg | 82 ++++++++ editor/icons/source/icon_GUI_slider_grabber.svg | 81 +++++++ editor/icons/source/icon_GUI_slider_grabber_hl.svg | 86 ++++++++ editor/icons/source/icon_GUI_spinbox_updown.svg | 83 ++++++++ editor/icons/source/icon_GUI_tab_menu.svg | 92 ++++++++ editor/icons/source/icon_GUI_toggle_off.svg | 80 +++++++ editor/icons/source/icon_GUI_toggle_on.svg | 80 +++++++ editor/icons/source/icon_GUI_tree_arrow_down.svg | 80 +++++++ editor/icons/source/icon_GUI_tree_arrow_right.svg | 80 +++++++ editor/icons/source/icon_GUI_unchecked.svg | 77 +++++++ editor/icons/source/icon_GUI_vslider_bg.svg | 83 ++++++++ editor/icons/source/icon_GUI_vsplit_bg.svg | 79 +++++++ editor/icons/source/icon_GUI_vsplitter.svg | 79 +++++++ editor/icons/source/icon_gui_close_dark.svg | 79 +++++++ editor/icons/source/icon_gui_close_light.svg | 79 +++++++ editor/icons/source/icon_help.svg | 50 +---- editor/icons/source/icon_help_search.svg | 91 ++++++++ editor/plugins/script_editor_plugin.cpp | 12 +- editor/plugins/script_editor_plugin.h | 4 +- modules/visual_script/visual_script_editor.cpp | 7 +- scene/gui/line_edit.cpp | 7 +- scene/resources/sky_box.cpp | 9 +- 90 files changed, 2313 insertions(+), 155 deletions(-) create mode 100644 editor/icons/2x/icon_GUI_checked.png create mode 100644 editor/icons/2x/icon_GUI_dropdown.png create mode 100644 editor/icons/2x/icon_GUI_hslider_bg.png create mode 100644 editor/icons/2x/icon_GUI_hsplitter.png create mode 100644 editor/icons/2x/icon_GUI_option_arrow.png create mode 100644 editor/icons/2x/icon_GUI_play_button_group.png create mode 100644 editor/icons/2x/icon_GUI_progress_bar.png create mode 100644 editor/icons/2x/icon_GUI_progress_fill.png create mode 100644 editor/icons/2x/icon_GUI_scroll_bg.png create mode 100644 editor/icons/2x/icon_GUI_scroll_grabber.png create mode 100644 editor/icons/2x/icon_GUI_scroll_grabber_hl.png create mode 100644 editor/icons/2x/icon_GUI_slider_grabber.png create mode 100644 editor/icons/2x/icon_GUI_slider_grabber_hl.png create mode 100644 editor/icons/2x/icon_GUI_spinbox_updown.png create mode 100644 editor/icons/2x/icon_GUI_tab_menu.png create mode 100644 editor/icons/2x/icon_GUI_toggle_off.png create mode 100644 editor/icons/2x/icon_GUI_toggle_on.png create mode 100644 editor/icons/2x/icon_GUI_tree_arrow_down.png create mode 100644 editor/icons/2x/icon_GUI_tree_arrow_right.png create mode 100644 editor/icons/2x/icon_GUI_unchecked.png create mode 100644 editor/icons/2x/icon_GUI_vslider_bg.png create mode 100644 editor/icons/2x/icon_GUI_vsplit_bg.png create mode 100644 editor/icons/2x/icon_GUI_vsplitter.png create mode 100644 editor/icons/2x/icon_gui_close_dark.png create mode 100644 editor/icons/2x/icon_gui_close_light.png create mode 100644 editor/icons/2x/icon_help_search.png create mode 100644 editor/icons/icon_GUI_checked.png create mode 100644 editor/icons/icon_GUI_dropdown.png create mode 100644 editor/icons/icon_GUI_hslider_bg.png create mode 100644 editor/icons/icon_GUI_hsplitter.png create mode 100644 editor/icons/icon_GUI_option_arrow.png create mode 100644 editor/icons/icon_GUI_play_button_group.png create mode 100644 editor/icons/icon_GUI_progress_bar.png create mode 100644 editor/icons/icon_GUI_progress_fill.png create mode 100644 editor/icons/icon_GUI_scroll_bg.png create mode 100644 editor/icons/icon_GUI_scroll_grabber.png create mode 100644 editor/icons/icon_GUI_scroll_grabber_hl.png create mode 100644 editor/icons/icon_GUI_slider_grabber.png create mode 100644 editor/icons/icon_GUI_slider_grabber_hl.png create mode 100644 editor/icons/icon_GUI_spinbox_updown.png create mode 100644 editor/icons/icon_GUI_tab_menu.png create mode 100644 editor/icons/icon_GUI_toggle_off.png create mode 100644 editor/icons/icon_GUI_toggle_on.png create mode 100644 editor/icons/icon_GUI_tree_arrow_down.png create mode 100644 editor/icons/icon_GUI_tree_arrow_right.png create mode 100644 editor/icons/icon_GUI_unchecked.png create mode 100644 editor/icons/icon_GUI_vslider_bg.png create mode 100644 editor/icons/icon_GUI_vsplit_bg.png create mode 100644 editor/icons/icon_GUI_vsplitter.png create mode 100644 editor/icons/icon_gui_close_dark.png create mode 100644 editor/icons/icon_gui_close_light.png create mode 100644 editor/icons/icon_help_search.png create mode 100644 editor/icons/source/icon_GUI_checked.svg create mode 100644 editor/icons/source/icon_GUI_dropdown.svg create mode 100644 editor/icons/source/icon_GUI_hslider_bg.svg create mode 100644 editor/icons/source/icon_GUI_hsplitter.svg create mode 100644 editor/icons/source/icon_GUI_option_arrow.svg create mode 100644 editor/icons/source/icon_GUI_play_button_group.svg create mode 100644 editor/icons/source/icon_GUI_progress_bar.svg create mode 100644 editor/icons/source/icon_GUI_progress_fill.svg create mode 100644 editor/icons/source/icon_GUI_scroll_bg.svg create mode 100644 editor/icons/source/icon_GUI_scroll_grabber.svg create mode 100644 editor/icons/source/icon_GUI_scroll_grabber_hl.svg create mode 100644 editor/icons/source/icon_GUI_slider_grabber.svg create mode 100644 editor/icons/source/icon_GUI_slider_grabber_hl.svg create mode 100644 editor/icons/source/icon_GUI_spinbox_updown.svg create mode 100644 editor/icons/source/icon_GUI_tab_menu.svg create mode 100644 editor/icons/source/icon_GUI_toggle_off.svg create mode 100644 editor/icons/source/icon_GUI_toggle_on.svg create mode 100644 editor/icons/source/icon_GUI_tree_arrow_down.svg create mode 100644 editor/icons/source/icon_GUI_tree_arrow_right.svg create mode 100644 editor/icons/source/icon_GUI_unchecked.svg create mode 100644 editor/icons/source/icon_GUI_vslider_bg.svg create mode 100644 editor/icons/source/icon_GUI_vsplit_bg.svg create mode 100644 editor/icons/source/icon_GUI_vsplitter.svg create mode 100644 editor/icons/source/icon_gui_close_dark.svg create mode 100644 editor/icons/source/icon_gui_close_light.svg create mode 100644 editor/icons/source/icon_help_search.svg diff --git a/editor/asset_library_editor_plugin.cpp b/editor/asset_library_editor_plugin.cpp index fcb92e13b4..27d468bc25 100644 --- a/editor/asset_library_editor_plugin.cpp +++ b/editor/asset_library_editor_plugin.cpp @@ -98,10 +98,10 @@ EditorAssetLibraryItem::EditorAssetLibraryItem() { Ref border; border.instance(); - /*border->set_default_margin(MARGIN_LEFT,5); - border->set_default_margin(MARGIN_RIGHT,5); - border->set_default_margin(MARGIN_BOTTOM,5); - border->set_default_margin(MARGIN_TOP,5);*/ + border->set_default_margin(MARGIN_LEFT, 5); + border->set_default_margin(MARGIN_RIGHT, 5); + border->set_default_margin(MARGIN_BOTTOM, 5); + border->set_default_margin(MARGIN_TOP, 5); add_style_override("panel", border); HBoxContainer *hb = memnew(HBoxContainer); @@ -1261,15 +1261,6 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) { templates_only = p_templates_only; - Ref border; - border.instance(); - border->set_default_margin(MARGIN_LEFT, 15); - border->set_default_margin(MARGIN_RIGHT, 15); - border->set_default_margin(MARGIN_BOTTOM, 5); - border->set_default_margin(MARGIN_TOP, 5); - - add_style_override("panel", border); - VBoxContainer *library_main = memnew(VBoxContainer); add_child(library_main); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 2e0174ad68..497a8ca452 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -341,7 +341,7 @@ void EditorNode::_notification(int p_what) { 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")); scene_root_parent->add_style_override("panel", gui_base->get_stylebox("Content", "EditorStyles")); - bottom_panel->add_style_override("panel", gui_base->get_stylebox("Content", "EditorStyles")); + bottom_panel->add_style_override("panel", gui_base->get_stylebox("panel", "TabContainer")); scene_tabs->add_style_override("tab_fg", gui_base->get_stylebox("SceneTabFG", "EditorStyles")); scene_tabs->add_style_override("tab_bg", gui_base->get_stylebox("SceneTabBG", "EditorStyles")); if (bool(EDITOR_DEF("interface/scene_tabs/resize_if_many_tabs", true))) { @@ -5422,6 +5422,7 @@ EditorNode::EditorNode() { scene_root_parent = memnew(PanelContainer); scene_root_parent->set_custom_minimum_size(Size2(0, 80) * EDSCALE); scene_root_parent->add_style_override("panel", gui_base->get_stylebox("Content", "EditorStyles")); + // sc->add_style_override("panel", gui_base->get_stylebox("Background", "EditorStyles")); //Ref sp = scene_root_parent->get_stylebox("panel","TabContainer"); //scene_root_parent->add_style_override("panel",sp); @@ -5990,7 +5991,7 @@ EditorNode::EditorNode() { _update_layouts_menu(); bottom_panel = memnew(PanelContainer); - bottom_panel->add_style_override("panel", gui_base->get_stylebox("Content", "EditorStyles")); + bottom_panel->add_style_override("panel", gui_base->get_stylebox("panel", "TabContainer")); center_split->add_child(bottom_panel); center_split->set_dragger_visibility(SplitContainer::DRAGGER_HIDDEN); diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 7a7b2b7d1e..4ab1a435f8 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -537,12 +537,15 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { set("interface/theme/preset", 0); hints["interface/theme/preset"] = PropertyInfo(Variant::INT, "interface/theme/preset", PROPERTY_HINT_ENUM, "Default,Grey,Godot 2,Arc,Custom", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); - set("interface/theme/base_color", Color::html("#273241")); + set("interface/theme/base_color", Color::html("#323b4f")); hints["interface/theme/highlight_color"] = PropertyInfo(Variant::COLOR, "interface/theme/highlight_color", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); - set("interface/theme/highlight_color", Color::html("#b79047")); + set("interface/theme/highlight_color", Color::html("#699ce8")); hints["interface/theme/base_color"] = PropertyInfo(Variant::COLOR, "interface/theme/base_color", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); set("interface/theme/contrast", 0.2); hints["interface/theme/contrast"] = PropertyInfo(Variant::REAL, "interface/theme/contrast", PROPERTY_HINT_RANGE, "0.01, 1, 0.01"); + set("interface/theme/highlight_tabs", false); + set("interface/theme/border_size", 1); + hints["interface/theme/border_size"] = PropertyInfo(Variant::INT, "interface/theme/border_size", PROPERTY_HINT_RANGE, "0,2,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); set("interface/theme/custom_theme", ""); hints["interface/theme/custom_theme"] = PropertyInfo(Variant::STRING, "interface/theme/custom_theme", PROPERTY_HINT_GLOBAL_FILE, "*.res,*.tres,*.theme", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); @@ -613,7 +616,7 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { set("editors/grid_map/pick_distance", 5000.0); - set("editors/3d/grid_color", Color(0, 1, 0, 0.2)); + set("editors/3d/grid_color", Color(1, 1, 1, 0.2)); hints["editors/3d/grid_color"] = PropertyInfo(Variant::COLOR, "editors/3d/grid_color", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); set("editors/3d/default_fov", 55.0); diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 5b8f41e75f..ce9b004ce1 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -94,17 +94,21 @@ Ref create_editor_theme() { editor_register_fonts(theme); editor_register_icons(theme); + const float default_contrast = 0.25; + // Define colors - Color highlight_color = EDITOR_DEF("interface/theme/highlight_color", Color::html("#b79047")); - Color base_color = EDITOR_DEF("interface/theme/base_color", Color::html("#273241")); - float contrast = EDITOR_DEF("interface/theme/contrast", 0.25); + Color highlight_color = EDITOR_DEF("interface/theme/highlight_color", Color::html("#000000")); + Color base_color = EDITOR_DEF("interface/theme/base_color", Color::html("#000000")); + float contrast = EDITOR_DEF("interface/theme/contrast", default_contrast); int preset = EDITOR_DEF("interface/theme/preset", 0); + bool highlight_tabs = EDITOR_DEF("interface/theme/highlight_tabs", false); + int border_size = EDITOR_DEF("interface/theme/border_size", 1); switch (preset) { case 0: { // Default - highlight_color = Color::html("#b79047"); - base_color = Color::html("#273241"); - contrast = 0.25; + highlight_color = Color::html("#699ce8"); + base_color = Color::html("#323b4f"); + contrast = default_contrast; } break; case 1: { // Grey highlight_color = Color::html("#3e3e3e"); @@ -130,6 +134,15 @@ Ref create_editor_theme() { Color light_color_1 = base_color.linear_interpolate(Color(1, 1, 1, 1), contrast); Color light_color_2 = base_color.linear_interpolate(Color(1, 1, 1, 1), contrast * 1.5); + const int border_width = (border_size % 3) * EDSCALE; + + Color title_color_hl = base_color; + if (highlight_tabs) + title_color_hl = base_color.linear_interpolate(Color(1, 1, 1, 1), contrast / default_contrast / 10); + bool dark_bg = ((title_color_hl.r + title_color_hl.g + title_color_hl.b) / 3.0) < 0.5; + Color title_color_hl_text_color = dark_bg ? Color(1, 1, 1, 0.9) : Color(0, 0, 0, 0.9); + Ref title_hl_close_icon = theme->get_icon((dark_bg ? "GuiCloseLight" : "GuiCloseDark"), "EditorIcons"); + theme->set_color("highlight_color", "Editor", highlight_color); theme->set_color("base_color", "Editor", base_color); theme->set_color("dark_color_1", "Editor", dark_color_1); @@ -139,10 +152,10 @@ Ref create_editor_theme() { theme->set_color("light_color_2", "Editor", light_color_2); // Checkbox icon - theme->set_icon("checked", "CheckBox", theme->get_icon("Checked", "EditorIcons")); - theme->set_icon("unchecked", "CheckBox", theme->get_icon("Unchecked", "EditorIcons")); - theme->set_icon("checked", "PopupMenu", theme->get_icon("Checked", "EditorIcons")); - theme->set_icon("unchecked", "PopupMenu", theme->get_icon("Unchecked", "EditorIcons")); + theme->set_icon("checked", "CheckBox", theme->get_icon("GuiChecked", "EditorIcons")); + theme->set_icon("unchecked", "CheckBox", theme->get_icon("GuiUnchecked", "EditorIcons")); + theme->set_icon("checked", "PopupMenu", theme->get_icon("GuiChecked", "EditorIcons")); + theme->set_icon("unchecked", "PopupMenu", theme->get_icon("GuiUnchecked", "EditorIcons")); // Editor background Ref style_panel = make_flat_stylebox(dark_color_2, 4, 4, 4, 4); @@ -151,7 +164,7 @@ Ref create_editor_theme() { // Focus Ref focus_sbt = make_flat_stylebox(light_color_1, 4, 4, 4, 4); focus_sbt->set_draw_center(false); - focus_sbt->set_border_size(1 * EDSCALE); + focus_sbt->set_border_size(border_width); focus_sbt = change_border_color(focus_sbt, light_color_2); theme->set_stylebox("Focus", "EditorStyles", focus_sbt); @@ -161,13 +174,13 @@ Ref create_editor_theme() { theme->set_stylebox("MenuPanel", "EditorStyles", style_menu); // Play button group - theme->set_stylebox("PlayButtonPanel", "EditorStyles", make_stylebox(theme->get_icon("PlayButtonGroup", "EditorIcons"), 16, 16, 16, 16, 8, 4, 8, 4)); + theme->set_stylebox("PlayButtonPanel", "EditorStyles", make_stylebox(theme->get_icon("GuiPlayButtonGroup", "EditorIcons"), 16, 16, 16, 16, 8, 4, 8, 4)); Ref style_menu_hover_border = make_flat_stylebox(highlight_color, 4, 4, 4, 4); Ref style_menu_hover_bg = make_flat_stylebox(dark_color_2, 4, 4, 4, 4); style_menu_hover_border->set_draw_center(false); - style_menu_hover_border->_set_additional_border_size(MARGIN_BOTTOM, 1 * EDSCALE); + style_menu_hover_border->_set_additional_border_size(MARGIN_BOTTOM, border_width); theme->set_stylebox("normal", "MenuButton", style_menu); theme->set_stylebox("hover", "MenuButton", style_menu); theme->set_stylebox("pressed", "MenuButton", style_menu); @@ -193,22 +206,37 @@ Ref create_editor_theme() { theme->set_stylebox("MenuHover", "EditorStyles", style_menu_hover_border); // Content of each tab - Ref style_content_panel = make_flat_stylebox(base_color, 1, 4, 1, 1); + Ref style_content_panel = make_flat_stylebox(base_color, 4, 5, 4, 4); + style_content_panel->set_dark_color(title_color_hl); + style_content_panel->set_light_color(title_color_hl); + style_content_panel->set_border_size(border_width); + style_content_panel->set_border_blend(false); + Ref style_content_panel_vp = make_flat_stylebox(base_color, border_width, 5, border_width, border_width); + style_content_panel_vp->set_dark_color(title_color_hl); + style_content_panel_vp->set_light_color(title_color_hl); + style_content_panel_vp->set_border_size(border_width); + style_content_panel_vp->set_border_blend(false); theme->set_stylebox("panel", "TabContainer", style_content_panel); - theme->set_stylebox("Content", "EditorStyles", style_content_panel); + theme->set_stylebox("Content", "EditorStyles", style_content_panel_vp); + + Ref style_button_type = make_flat_stylebox(dark_color_1, 4, 4, 6, 4); + style_button_type->set_draw_center(true); + style_button_type->set_border_size(border_width); + style_button_type->set_light_color(light_color_1); + style_button_type->set_dark_color(light_color_1); + style_button_type->set_border_blend(false); + + Ref style_button_type_disabled = change_border_color(style_button_type, dark_color_2); + + Color button_font_color = light_color_1.linear_interpolate(Color(1, 1, 1, 1), .6); // Button - Ref style_button = make_flat_stylebox(dark_color_1, 4, 4, 4, 4); - style_button->set_draw_center(true); - style_button->set_border_size(2 * EDSCALE); - style_button->set_light_color(light_color_1); - style_button->set_dark_color(light_color_1); - style_button->set_border_blend(false); - theme->set_stylebox("normal", "Button", style_button); - theme->set_stylebox("hover", "Button", style_button); - theme->set_stylebox("pressed", "Button", style_button); - theme->set_stylebox("focus", "Button", style_button); - theme->set_stylebox("disabled", "Button", style_button); + theme->set_stylebox("normal", "Button", style_button_type); + theme->set_stylebox("hover", "Button", change_border_color(style_button_type, HIGHLIGHT_COLOR_LIGHT)); + theme->set_stylebox("pressed", "Button", change_border_color(style_button_type, highlight_color)); + theme->set_stylebox("focus", "Button", change_border_color(style_button_type, highlight_color)); + theme->set_stylebox("disabled", "Button", style_button_type_disabled); + theme->set_color("font_color", "Button", button_font_color); theme->set_color("font_color_hover", "Button", HIGHLIGHT_COLOR_LIGHT); theme->set_color("font_color_pressed", "Button", highlight_color); theme->set_color("icon_color_hover", "Button", HIGHLIGHT_COLOR_LIGHT); @@ -217,41 +245,57 @@ Ref create_editor_theme() { // OptionButton Ref style_option_button = make_flat_stylebox(dark_color_1, 4, 4, 4, 4); - style_option_button->set_border_size(1 * EDSCALE); + style_option_button->set_border_size(border_width); style_option_button->set_light_color(light_color_1); style_option_button->set_dark_color(light_color_1); - style_option_button->_set_additional_border_size(MARGIN_RIGHT, -16 * EDSCALE); - theme->set_stylebox("hover", "OptionButton", change_border_color(style_option_button, HIGHLIGHT_COLOR_LIGHT)); - theme->set_stylebox("pressed", "OptionButton", change_border_color(style_option_button, highlight_color)); - theme->set_stylebox("focus", "OptionButton", change_border_color(style_option_button, highlight_color)); - theme->set_stylebox("disabled", "OptionButton", style_option_button); - theme->set_stylebox("normal", "OptionButton", style_option_button); - theme->set_icon("arrow", "OptionButton", theme->get_icon("OptionArrow", "EditorIcons")); + style_option_button->set_border_blend(false); + theme->set_stylebox("hover", "OptionButton", change_border_color(style_button_type, HIGHLIGHT_COLOR_LIGHT)); + theme->set_stylebox("pressed", "OptionButton", change_border_color(style_button_type, highlight_color)); + theme->set_stylebox("focus", "OptionButton", change_border_color(style_button_type, highlight_color)); + theme->set_stylebox("disabled", "OptionButton", style_button_type_disabled); + theme->set_stylebox("normal", "OptionButton", style_button_type); + theme->set_color("font_color", "OptionButton", button_font_color); + theme->set_color("font_color_hover", "OptionButton", HIGHLIGHT_COLOR_LIGHT); + theme->set_color("font_color_pressed", "OptionButton", highlight_color); + theme->set_color("icon_color_hover", "OptionButton", HIGHLIGHT_COLOR_LIGHT); + theme->set_icon("arrow", "OptionButton", theme->get_icon("GuiOptionArrow", "EditorIcons")); + + // CheckButton + theme->set_icon("on", "CheckButton", theme->get_icon("GuiToggleOn", "EditorIcons")); + theme->set_icon("off", "CheckButton", theme->get_icon("GuiToggleOff", "EditorIcons")); // PopupMenu Ref style_popup_menu = make_flat_stylebox(dark_color_1, 8, 8, 8, 8); - style_popup_menu->set_border_size(2 * EDSCALE); + style_popup_menu->set_border_size(border_width); style_popup_menu->set_light_color(light_color_1); style_popup_menu->set_dark_color(light_color_1); + style_popup_menu->set_border_blend(false); theme->set_stylebox("panel", "PopupMenu", style_popup_menu); + theme->set_stylebox("separator", "PopupMenu", make_empty_stylebox()); // Tree & ItemList background Ref style_tree_bg = make_flat_stylebox(dark_color_1, 2, 4, 2, 4); + style_tree_bg->set_border_size(border_width); + style_tree_bg->set_light_color(dark_color_3); + style_tree_bg->set_dark_color(dark_color_3); theme->set_stylebox("bg", "Tree", style_tree_bg); // Script background Ref style_script_bg = make_flat_stylebox(dark_color_1, 0, 0, 0, 0); + style_script_bg->set_border_size(border_width); + style_script_bg->set_light_color(dark_color_3); + style_script_bg->set_dark_color(dark_color_3); theme->set_stylebox("ScriptPanel", "EditorStyles", style_script_bg); // Tree - theme->set_icon("checked", "Tree", theme->get_icon("Checked", "EditorIcons")); - theme->set_icon("unchecked", "Tree", theme->get_icon("Unchecked", "EditorIcons")); - theme->set_icon("arrow", "Tree", theme->get_icon("TreeArrowDown", "EditorIcons")); - theme->set_icon("arrow_collapsed", "Tree", theme->get_icon("TreeArrowRight", "EditorIcons")); - theme->set_icon("select_arrow", "Tree", theme->get_icon("Dropdown", "EditorIcons")); + theme->set_icon("checked", "Tree", theme->get_icon("GuiChecked", "EditorIcons")); + theme->set_icon("unchecked", "Tree", theme->get_icon("GuiUnchecked", "EditorIcons")); + theme->set_icon("arrow", "Tree", theme->get_icon("GuiTreeArrowDown", "EditorIcons")); + theme->set_icon("arrow_collapsed", "Tree", theme->get_icon("GuiTreeArrowRight", "EditorIcons")); + theme->set_icon("select_arrow", "Tree", theme->get_icon("GuiDropdown", "EditorIcons")); theme->set_stylebox("bg_focus", "Tree", focus_sbt); - theme->set_stylebox("custom_button", "Tree", style_button); - theme->set_stylebox("custom_button_pressed", "Tree", style_button); - theme->set_stylebox("custom_button_hover", "Tree", style_button); + theme->set_stylebox("custom_button", "Tree", style_button_type); + theme->set_stylebox("custom_button_pressed", "Tree", style_button_type); + theme->set_stylebox("custom_button_hover", "Tree", style_button_type); theme->set_color("custom_button_font_highlight", "Tree", HIGHLIGHT_COLOR_LIGHT); Ref style_tree_btn = make_flat_stylebox(light_color_1, 2, 4, 2, 4); @@ -265,7 +309,7 @@ Ref create_editor_theme() { Ref style_tree_cursor = make_flat_stylebox(HIGHLIGHT_COLOR_DARK, 4, 4, 4, 4); style_tree_cursor->set_draw_center(false); - style_tree_cursor->set_border_size(1 * EDSCALE); + style_tree_cursor->set_border_size(border_width); style_tree_cursor->set_light_color(light_color_1); style_tree_cursor->set_dark_color(light_color_1); Ref style_tree_title = make_flat_stylebox(dark_color_3, 4, 4, 4, 4); @@ -284,9 +328,12 @@ Ref create_editor_theme() { // ItemList Ref style_itemlist_bg = make_flat_stylebox(dark_color_1, 4, 4, 4, 4); + style_itemlist_bg->set_border_size(border_width); + style_itemlist_bg->set_light_color(dark_color_3); + style_itemlist_bg->set_dark_color(dark_color_3); Ref style_itemlist_cursor = make_flat_stylebox(highlight_color, 0, 0, 0, 0); style_itemlist_cursor->set_draw_center(false); - style_itemlist_cursor->set_border_size(1 * EDSCALE); + style_itemlist_cursor->set_border_size(border_width); style_itemlist_cursor->set_light_color(HIGHLIGHT_COLOR_DARK); style_itemlist_cursor->set_dark_color(HIGHLIGHT_COLOR_DARK); theme->set_stylebox("cursor", "ItemList", style_itemlist_cursor); @@ -297,7 +344,7 @@ Ref create_editor_theme() { theme->set_stylebox("bg", "ItemList", style_itemlist_bg); theme->set_constant("vseparation", "ItemList", 5 * EDSCALE); - Ref style_tab_fg = make_flat_stylebox(base_color, 15, 5, 15, 5); + Ref style_tab_fg = make_flat_stylebox(title_color_hl, 15, 5, 15, 5); Ref style_tab_bg = make_flat_stylebox(base_color, 15, 5, 15, 5); style_tab_bg->set_draw_center(false); @@ -306,12 +353,17 @@ Ref create_editor_theme() { theme->set_stylebox("tab_bg", "TabContainer", style_tab_bg); theme->set_stylebox("tab_fg", "Tabs", style_tab_fg); theme->set_stylebox("tab_bg", "Tabs", style_tab_bg); - theme->set_color("font_color_fg", "TabContainer", Color(1, 1, 1, 1)); + theme->set_color("font_color_fg", "TabContainer", title_color_hl_text_color); theme->set_color("font_color_bg", "TabContainer", light_color_2); - theme->set_icon("menu", "TabContainer", theme->get_icon("TabMenu", "EditorIcons")); - theme->set_icon("menu_hl", "TabContainer", theme->get_icon("TabMenu", "EditorIcons")); - theme->set_stylebox("SceneTabFG", "EditorStyles", make_flat_stylebox(base_color, 10, 5, 10, 5)); + theme->set_icon("menu", "TabContainer", theme->get_icon("GuiTabMenu", "EditorIcons")); + theme->set_icon("menu_hl", "TabContainer", theme->get_icon("GuiTabMenu", "EditorIcons")); + theme->set_stylebox("SceneTabFG", "EditorStyles", make_flat_stylebox(title_color_hl, 10, 5, 10, 5)); theme->set_stylebox("SceneTabBG", "EditorStyles", make_empty_stylebox(6, 5, 6, 5)); + theme->set_icon("close", "Tabs", title_hl_close_icon); + + // Separatos (no separatos) + theme->set_stylebox("separator", "HSeparator", make_empty_stylebox()); + theme->set_stylebox("separator", "VSeparator", make_empty_stylebox()); // Debugger Ref style_panel_debugger = make_flat_stylebox(dark_color_2, 0, 4, 0, 0); @@ -325,16 +377,15 @@ Ref create_editor_theme() { theme->set_stylebox("DebuggerTabBG", "EditorStyles", style_tab_bg_debugger); // LineEdit - Ref style_lineedit = make_flat_stylebox(dark_color_1, 4, 4, 4, 4); - style_lineedit->set_border_size(1 * EDSCALE); + Ref style_lineedit = style_button_type; style_lineedit = change_border_color(style_lineedit, light_color_1); - Ref style_lineedit_disabled = style_lineedit->duplicate(); - style_lineedit_disabled->set_bg_color(light_color_1); + Ref style_lineedit_disabled = change_border_color(style_lineedit, dark_color_1); + style_lineedit_disabled->set_bg_color(Color(0, 0, 0, .1)); Ref style_lineedit_focus = change_border_color(style_lineedit, highlight_color); - style_lineedit_focus->set_draw_center(false); theme->set_stylebox("normal", "LineEdit", style_lineedit); theme->set_stylebox("focus", "LineEdit", style_lineedit_focus); theme->set_stylebox("read_only", "LineEdit", style_lineedit_disabled); + theme->set_color("read_only", "LineEdit", dark_color_1); // TextEdit Ref style_textedit_normal(memnew(StyleBoxFlat)); @@ -348,31 +399,36 @@ Ref create_editor_theme() { theme->set_constant("side_margin", "TabContainer", 0); // H/VSplitContainer - theme->set_stylebox("bg", "VSplitContainer", make_stylebox(theme->get_icon("VsplitBg", "EditorIcons"), 1, 1, 1, 1)); - theme->set_stylebox("bg", "HSplitContainer", make_stylebox(theme->get_icon("HsplitBg", "EditorIcons"), 1, 1, 1, 1)); + theme->set_stylebox("bg", "VSplitContainer", make_stylebox(theme->get_icon("GuiVsplitBg", "EditorIcons"), 1, 1, 1, 1)); + theme->set_stylebox("bg", "HSplitContainer", make_stylebox(theme->get_icon("GuiHsplitBg", "EditorIcons"), 1, 1, 1, 1)); - theme->set_icon("grabber", "VSplitContainer", theme->get_icon("Vsplitter", "EditorIcons")); - theme->set_icon("grabber", "HSplitContainer", theme->get_icon("Hsplitter", "EditorIcons")); + theme->set_icon("grabber", "VSplitContainer", theme->get_icon("GuiVsplitter", "EditorIcons")); + theme->set_icon("grabber", "HSplitContainer", theme->get_icon("GuiHsplitter", "EditorIcons")); theme->set_constant("separation", "HSplitContainer", 8 * EDSCALE); theme->set_constant("separation", "VSplitContainer", 8 * EDSCALE); // WindowDialog Ref style_window = make_flat_stylebox(dark_color_2, 4, 4, 4, 4); - style_window->set_border_size(2 * EDSCALE); + style_window->set_border_size(border_width); style_window->set_border_blend(false); - style_window->set_light_color(light_color_2); - style_window->set_dark_color(light_color_2); + style_window->set_light_color(title_color_hl); + style_window->set_dark_color(title_color_hl); style_window->_set_additional_border_size(MARGIN_TOP, 24 * EDSCALE); theme->set_stylebox("panel", "WindowDialog", style_window); + theme->set_color("title_color", "WindowDialog", title_color_hl_text_color); + theme->set_icon("close", "WindowDialog", title_hl_close_icon); + theme->set_icon("close_highlight", "WindowDialog", title_hl_close_icon); + theme->set_constant("close_h_ofs", "WindowDialog", 22 * EDSCALE); + theme->set_constant("close_v_ofs", "WindowDialog", 18 * EDSCALE); // HScrollBar Ref empty_icon = memnew(ImageTexture); - theme->set_stylebox("scroll", "HScrollBar", make_stylebox(theme->get_icon("ScrollBg", "EditorIcons"), 5, 5, 5, 5, 0, 0, 0, 0)); - theme->set_stylebox("scroll_focus", "HScrollBar", make_stylebox(theme->get_icon("ScrollBg", "EditorIcons"), 5, 5, 5, 5, 0, 0, 0, 0)); - theme->set_stylebox("grabber", "HScrollBar", make_stylebox(theme->get_icon("ScrollGrabber", "EditorIcons"), 6, 6, 6, 6, 2, 2, 2, 2)); - theme->set_stylebox("grabber_highlight", "HScrollBar", make_stylebox(theme->get_icon("ScrollGrabberHl", "EditorIcons"), 5, 5, 5, 5, 2, 2, 2, 2)); + theme->set_stylebox("scroll", "HScrollBar", make_stylebox(theme->get_icon("GuiScrollBg", "EditorIcons"), 5, 5, 5, 5, 0, 0, 0, 0)); + theme->set_stylebox("scroll_focus", "HScrollBar", make_stylebox(theme->get_icon("GuiScrollBg", "EditorIcons"), 5, 5, 5, 5, 0, 0, 0, 0)); + theme->set_stylebox("grabber", "HScrollBar", make_stylebox(theme->get_icon("GuiScrollGrabber", "EditorIcons"), 6, 6, 6, 6, 2, 2, 2, 2)); + theme->set_stylebox("grabber_highlight", "HScrollBar", make_stylebox(theme->get_icon("GuiScrollGrabberHl", "EditorIcons"), 5, 5, 5, 5, 2, 2, 2, 2)); theme->set_icon("increment", "HScrollBar", empty_icon); theme->set_icon("increment_highlight", "HScrollBar", empty_icon); @@ -380,10 +436,10 @@ Ref create_editor_theme() { theme->set_icon("decrement_highlight", "HScrollBar", empty_icon); // VScrollBar - theme->set_stylebox("scroll", "VScrollBar", make_stylebox(theme->get_icon("ScrollBg", "EditorIcons"), 5, 5, 5, 5, 0, 0, 0, 0)); - theme->set_stylebox("scroll_focus", "VScrollBar", make_stylebox(theme->get_icon("ScrollBg", "EditorIcons"), 5, 5, 5, 5, 0, 0, 0, 0)); - theme->set_stylebox("grabber", "VScrollBar", make_stylebox(theme->get_icon("ScrollGrabber", "EditorIcons"), 6, 6, 6, 6, 2, 2, 2, 2)); - theme->set_stylebox("grabber_highlight", "VScrollBar", make_stylebox(theme->get_icon("ScrollGrabberHl", "EditorIcons"), 5, 5, 5, 5, 2, 2, 2, 2)); + theme->set_stylebox("scroll", "VScrollBar", make_stylebox(theme->get_icon("GuiScrollBg", "EditorIcons"), 5, 5, 5, 5, 0, 0, 0, 0)); + theme->set_stylebox("scroll_focus", "VScrollBar", make_stylebox(theme->get_icon("GuiScrollBg", "EditorIcons"), 5, 5, 5, 5, 0, 0, 0, 0)); + theme->set_stylebox("grabber", "VScrollBar", make_stylebox(theme->get_icon("GuiScrollGrabber", "EditorIcons"), 6, 6, 6, 6, 2, 2, 2, 2)); + theme->set_stylebox("grabber_highlight", "VScrollBar", make_stylebox(theme->get_icon("GuiScrollGrabberHl", "EditorIcons"), 5, 5, 5, 5, 2, 2, 2, 2)); theme->set_icon("increment", "VScrollBar", empty_icon); theme->set_icon("increment_highlight", "VScrollBar", empty_icon); @@ -391,21 +447,21 @@ Ref create_editor_theme() { theme->set_icon("decrement_highlight", "VScrollBar", empty_icon); // HSlider - theme->set_stylebox("slider", "HSlider", make_stylebox(theme->get_icon("HsliderBg", "EditorIcons"), 4, 4, 4, 4)); - theme->set_icon("grabber", "HSlider", theme->get_icon("SliderGrabber", "EditorIcons")); - theme->set_icon("grabber_highlight", "HSlider", theme->get_icon("SliderGrabberHl", "EditorIcons")); + theme->set_stylebox("slider", "HSlider", make_stylebox(theme->get_icon("GuiHsliderBg", "EditorIcons"), 4, 4, 4, 4)); + theme->set_icon("grabber", "HSlider", theme->get_icon("GuiSliderGrabber", "EditorIcons")); + theme->set_icon("grabber_highlight", "HSlider", theme->get_icon("GuiSliderGrabberHl", "EditorIcons")); // VSlider - theme->set_stylebox("slider", "VSlider", make_stylebox(theme->get_icon("VsliderBg", "EditorIcons"), 4, 4, 4, 4)); - theme->set_icon("grabber", "VSlider", theme->get_icon("SliderGrabber", "EditorIcons")); - theme->set_icon("grabber_highlight", "VSlider", theme->get_icon("SliderGrabberHl", "EditorIcons")); + theme->set_stylebox("slider", "VSlider", make_stylebox(theme->get_icon("GuiVsliderBg", "EditorIcons"), 4, 4, 4, 4)); + theme->set_icon("grabber", "VSlider", theme->get_icon("GuiSliderGrabber", "EditorIcons")); + theme->set_icon("grabber_highlight", "VSlider", theme->get_icon("GuiSliderGrabberHl", "EditorIcons")); // Panel theme->set_stylebox("panel", "Panel", style_panel); // TooltipPanel Ref style_tooltip = make_flat_stylebox(Color(1, 1, 1, 0.8), 8, 8, 8, 8); - style_tooltip->set_border_size(2 * EDSCALE); + style_tooltip->set_border_size(border_width); style_tooltip->set_border_blend(false); style_tooltip->set_light_color(Color(1, 1, 1, 0.9)); style_tooltip->set_dark_color(Color(1, 1, 1, 0.9)); @@ -419,30 +475,42 @@ Ref create_editor_theme() { theme->set_stylebox("panel", "PopupPanel", style_dock_select); // SpinBox - theme->set_icon("updown", "SpinBox", theme->get_icon("SpinboxUpdown", "EditorIcons")); + theme->set_icon("updown", "SpinBox", theme->get_icon("GuiSpinboxUpdown", "EditorIcons")); + + // ProgressBar + theme->set_stylebox("bg", "ProgressBar", make_stylebox(theme->get_icon("GuiProgressBar", "EditorIcons"), 4, 4, 4, 4, 0, 0, 0, 0)); + theme->set_stylebox("fg", "ProgressBar", make_stylebox(theme->get_icon("GuiProgressFill", "EditorIcons"), 6, 6, 6, 6, 2, 1, 2, 1)); + + // theme->set_font("font", "ProgressBar", default_font); + + // theme->set_color("font_color", "ProgressBar", control_font_color_hover); + theme->set_color("font_color_shadow", "ProgressBar", Color(0, 0, 0)); + + // GraphEdit + theme->set_stylebox("bg", "GraphEdit", make_flat_stylebox(dark_color_2, 4, 4, 4, 4)); // GraphNode Ref graphsb = make_flat_stylebox(Color(0, 0, 0, 0.3), 16, 24, 16, 5); graphsb->set_border_blend(false); - graphsb->set_border_size(2); + graphsb->set_border_size(border_width); graphsb->set_light_color(Color(1, 1, 1, 0.6)); graphsb->set_dark_color(Color(1, 1, 1, 0.6)); graphsb = add_additional_border(graphsb, 0, -22, 0, 0); Ref graphsbselected = make_flat_stylebox(Color(0, 0, 0, 0.4), 16, 24, 16, 5); graphsbselected->set_border_blend(false); - graphsbselected->set_border_size(2); + graphsbselected->set_border_size(border_width); graphsbselected->set_light_color(Color(1, 1, 1, 0.9)); graphsbselected->set_dark_color(Color(1, 1, 1, 0.9)); graphsbselected = add_additional_border(graphsbselected, 0, -22, 0, 0); Ref graphsbcomment = make_flat_stylebox(Color(0, 0, 0, 0.3), 16, 24, 16, 5); graphsbcomment->set_border_blend(false); - graphsbcomment->set_border_size(1); + graphsbcomment->set_border_size(border_width); graphsbcomment->set_light_color(Color(1, 1, 1, 0.6)); graphsbcomment->set_dark_color(Color(1, 1, 1, 0.6)); graphsbcomment = add_additional_border(graphsbcomment, 0, -22, 0, 0); Ref graphsbcommentselected = make_flat_stylebox(Color(0, 0, 0, 0.4), 16, 24, 16, 5); graphsbcommentselected->set_border_blend(false); - graphsbcommentselected->set_border_size(1); + graphsbcommentselected->set_border_size(border_width); graphsbcommentselected->set_light_color(Color(1, 1, 1, 0.9)); graphsbcommentselected->set_dark_color(Color(1, 1, 1, 0.9)); graphsbcommentselected = add_additional_border(graphsbcommentselected, 0, -22, 0, 0); diff --git a/editor/icons/2x/icon_GUI_checked.png b/editor/icons/2x/icon_GUI_checked.png new file mode 100644 index 0000000000..d51f20b867 Binary files /dev/null and b/editor/icons/2x/icon_GUI_checked.png differ diff --git a/editor/icons/2x/icon_GUI_dropdown.png b/editor/icons/2x/icon_GUI_dropdown.png new file mode 100644 index 0000000000..c959378430 Binary files /dev/null and b/editor/icons/2x/icon_GUI_dropdown.png differ diff --git a/editor/icons/2x/icon_GUI_hslider_bg.png b/editor/icons/2x/icon_GUI_hslider_bg.png new file mode 100644 index 0000000000..38af962095 Binary files /dev/null and b/editor/icons/2x/icon_GUI_hslider_bg.png differ diff --git a/editor/icons/2x/icon_GUI_hsplitter.png b/editor/icons/2x/icon_GUI_hsplitter.png new file mode 100644 index 0000000000..063f0c90fc Binary files /dev/null and b/editor/icons/2x/icon_GUI_hsplitter.png differ diff --git a/editor/icons/2x/icon_GUI_option_arrow.png b/editor/icons/2x/icon_GUI_option_arrow.png new file mode 100644 index 0000000000..87fdc8aa51 Binary files /dev/null and b/editor/icons/2x/icon_GUI_option_arrow.png differ diff --git a/editor/icons/2x/icon_GUI_play_button_group.png b/editor/icons/2x/icon_GUI_play_button_group.png new file mode 100644 index 0000000000..6a569d5e80 Binary files /dev/null and b/editor/icons/2x/icon_GUI_play_button_group.png differ diff --git a/editor/icons/2x/icon_GUI_progress_bar.png b/editor/icons/2x/icon_GUI_progress_bar.png new file mode 100644 index 0000000000..ca53eba8d0 Binary files /dev/null and b/editor/icons/2x/icon_GUI_progress_bar.png differ diff --git a/editor/icons/2x/icon_GUI_progress_fill.png b/editor/icons/2x/icon_GUI_progress_fill.png new file mode 100644 index 0000000000..ac6c562650 Binary files /dev/null and b/editor/icons/2x/icon_GUI_progress_fill.png differ diff --git a/editor/icons/2x/icon_GUI_scroll_bg.png b/editor/icons/2x/icon_GUI_scroll_bg.png new file mode 100644 index 0000000000..58369d6f96 Binary files /dev/null and b/editor/icons/2x/icon_GUI_scroll_bg.png differ diff --git a/editor/icons/2x/icon_GUI_scroll_grabber.png b/editor/icons/2x/icon_GUI_scroll_grabber.png new file mode 100644 index 0000000000..6f74a9365f Binary files /dev/null and b/editor/icons/2x/icon_GUI_scroll_grabber.png differ diff --git a/editor/icons/2x/icon_GUI_scroll_grabber_hl.png b/editor/icons/2x/icon_GUI_scroll_grabber_hl.png new file mode 100644 index 0000000000..c03ca1adf9 Binary files /dev/null and b/editor/icons/2x/icon_GUI_scroll_grabber_hl.png differ diff --git a/editor/icons/2x/icon_GUI_slider_grabber.png b/editor/icons/2x/icon_GUI_slider_grabber.png new file mode 100644 index 0000000000..97e97cb536 Binary files /dev/null and b/editor/icons/2x/icon_GUI_slider_grabber.png differ diff --git a/editor/icons/2x/icon_GUI_slider_grabber_hl.png b/editor/icons/2x/icon_GUI_slider_grabber_hl.png new file mode 100644 index 0000000000..2229e25a60 Binary files /dev/null and b/editor/icons/2x/icon_GUI_slider_grabber_hl.png differ diff --git a/editor/icons/2x/icon_GUI_spinbox_updown.png b/editor/icons/2x/icon_GUI_spinbox_updown.png new file mode 100644 index 0000000000..a20b43f9c3 Binary files /dev/null and b/editor/icons/2x/icon_GUI_spinbox_updown.png differ diff --git a/editor/icons/2x/icon_GUI_tab_menu.png b/editor/icons/2x/icon_GUI_tab_menu.png new file mode 100644 index 0000000000..3887615fee Binary files /dev/null and b/editor/icons/2x/icon_GUI_tab_menu.png differ diff --git a/editor/icons/2x/icon_GUI_toggle_off.png b/editor/icons/2x/icon_GUI_toggle_off.png new file mode 100644 index 0000000000..9da02707d1 Binary files /dev/null and b/editor/icons/2x/icon_GUI_toggle_off.png differ diff --git a/editor/icons/2x/icon_GUI_toggle_on.png b/editor/icons/2x/icon_GUI_toggle_on.png new file mode 100644 index 0000000000..41a25e9345 Binary files /dev/null and b/editor/icons/2x/icon_GUI_toggle_on.png differ diff --git a/editor/icons/2x/icon_GUI_tree_arrow_down.png b/editor/icons/2x/icon_GUI_tree_arrow_down.png new file mode 100644 index 0000000000..c71c6f4159 Binary files /dev/null and b/editor/icons/2x/icon_GUI_tree_arrow_down.png differ diff --git a/editor/icons/2x/icon_GUI_tree_arrow_right.png b/editor/icons/2x/icon_GUI_tree_arrow_right.png new file mode 100644 index 0000000000..66331c730a Binary files /dev/null and b/editor/icons/2x/icon_GUI_tree_arrow_right.png differ diff --git a/editor/icons/2x/icon_GUI_unchecked.png b/editor/icons/2x/icon_GUI_unchecked.png new file mode 100644 index 0000000000..f76b6351d8 Binary files /dev/null and b/editor/icons/2x/icon_GUI_unchecked.png differ diff --git a/editor/icons/2x/icon_GUI_vslider_bg.png b/editor/icons/2x/icon_GUI_vslider_bg.png new file mode 100644 index 0000000000..eeb68e2d7a Binary files /dev/null and b/editor/icons/2x/icon_GUI_vslider_bg.png differ diff --git a/editor/icons/2x/icon_GUI_vsplit_bg.png b/editor/icons/2x/icon_GUI_vsplit_bg.png new file mode 100644 index 0000000000..09524bd25a Binary files /dev/null and b/editor/icons/2x/icon_GUI_vsplit_bg.png differ diff --git a/editor/icons/2x/icon_GUI_vsplitter.png b/editor/icons/2x/icon_GUI_vsplitter.png new file mode 100644 index 0000000000..84920525b7 Binary files /dev/null and b/editor/icons/2x/icon_GUI_vsplitter.png differ diff --git a/editor/icons/2x/icon_gui_close_dark.png b/editor/icons/2x/icon_gui_close_dark.png new file mode 100644 index 0000000000..fe47e003f9 Binary files /dev/null and b/editor/icons/2x/icon_gui_close_dark.png differ diff --git a/editor/icons/2x/icon_gui_close_light.png b/editor/icons/2x/icon_gui_close_light.png new file mode 100644 index 0000000000..2d93123f20 Binary files /dev/null and b/editor/icons/2x/icon_gui_close_light.png differ diff --git a/editor/icons/2x/icon_help.png b/editor/icons/2x/icon_help.png index f16a34c918..771b815020 100644 Binary files a/editor/icons/2x/icon_help.png and b/editor/icons/2x/icon_help.png differ diff --git a/editor/icons/2x/icon_help_search.png b/editor/icons/2x/icon_help_search.png new file mode 100644 index 0000000000..a35c4b6070 Binary files /dev/null and b/editor/icons/2x/icon_help_search.png differ diff --git a/editor/icons/icon_GUI_checked.png b/editor/icons/icon_GUI_checked.png new file mode 100644 index 0000000000..aa5e7f6bdb Binary files /dev/null and b/editor/icons/icon_GUI_checked.png differ diff --git a/editor/icons/icon_GUI_dropdown.png b/editor/icons/icon_GUI_dropdown.png new file mode 100644 index 0000000000..4bd6544830 Binary files /dev/null and b/editor/icons/icon_GUI_dropdown.png differ diff --git a/editor/icons/icon_GUI_hslider_bg.png b/editor/icons/icon_GUI_hslider_bg.png new file mode 100644 index 0000000000..1286b887f6 Binary files /dev/null and b/editor/icons/icon_GUI_hslider_bg.png differ diff --git a/editor/icons/icon_GUI_hsplitter.png b/editor/icons/icon_GUI_hsplitter.png new file mode 100644 index 0000000000..3ac1dddf90 Binary files /dev/null and b/editor/icons/icon_GUI_hsplitter.png differ diff --git a/editor/icons/icon_GUI_option_arrow.png b/editor/icons/icon_GUI_option_arrow.png new file mode 100644 index 0000000000..b7bc38e03f Binary files /dev/null and b/editor/icons/icon_GUI_option_arrow.png differ diff --git a/editor/icons/icon_GUI_play_button_group.png b/editor/icons/icon_GUI_play_button_group.png new file mode 100644 index 0000000000..83820c8e0c Binary files /dev/null and b/editor/icons/icon_GUI_play_button_group.png differ diff --git a/editor/icons/icon_GUI_progress_bar.png b/editor/icons/icon_GUI_progress_bar.png new file mode 100644 index 0000000000..7d70e6beb5 Binary files /dev/null and b/editor/icons/icon_GUI_progress_bar.png differ diff --git a/editor/icons/icon_GUI_progress_fill.png b/editor/icons/icon_GUI_progress_fill.png new file mode 100644 index 0000000000..4b7b4c554c Binary files /dev/null and b/editor/icons/icon_GUI_progress_fill.png differ diff --git a/editor/icons/icon_GUI_scroll_bg.png b/editor/icons/icon_GUI_scroll_bg.png new file mode 100644 index 0000000000..1908fd8aee Binary files /dev/null and b/editor/icons/icon_GUI_scroll_bg.png differ diff --git a/editor/icons/icon_GUI_scroll_grabber.png b/editor/icons/icon_GUI_scroll_grabber.png new file mode 100644 index 0000000000..4be7f4e6cc Binary files /dev/null and b/editor/icons/icon_GUI_scroll_grabber.png differ diff --git a/editor/icons/icon_GUI_scroll_grabber_hl.png b/editor/icons/icon_GUI_scroll_grabber_hl.png new file mode 100644 index 0000000000..98e357f82a Binary files /dev/null and b/editor/icons/icon_GUI_scroll_grabber_hl.png differ diff --git a/editor/icons/icon_GUI_slider_grabber.png b/editor/icons/icon_GUI_slider_grabber.png new file mode 100644 index 0000000000..76edc3b81f Binary files /dev/null and b/editor/icons/icon_GUI_slider_grabber.png differ diff --git a/editor/icons/icon_GUI_slider_grabber_hl.png b/editor/icons/icon_GUI_slider_grabber_hl.png new file mode 100644 index 0000000000..97a2f4b67a Binary files /dev/null and b/editor/icons/icon_GUI_slider_grabber_hl.png differ diff --git a/editor/icons/icon_GUI_spinbox_updown.png b/editor/icons/icon_GUI_spinbox_updown.png new file mode 100644 index 0000000000..ff65df801b Binary files /dev/null and b/editor/icons/icon_GUI_spinbox_updown.png differ diff --git a/editor/icons/icon_GUI_tab_menu.png b/editor/icons/icon_GUI_tab_menu.png new file mode 100644 index 0000000000..ffc63f2d41 Binary files /dev/null and b/editor/icons/icon_GUI_tab_menu.png differ diff --git a/editor/icons/icon_GUI_toggle_off.png b/editor/icons/icon_GUI_toggle_off.png new file mode 100644 index 0000000000..c4c599172d Binary files /dev/null and b/editor/icons/icon_GUI_toggle_off.png differ diff --git a/editor/icons/icon_GUI_toggle_on.png b/editor/icons/icon_GUI_toggle_on.png new file mode 100644 index 0000000000..9dd6ce7bee Binary files /dev/null and b/editor/icons/icon_GUI_toggle_on.png differ diff --git a/editor/icons/icon_GUI_tree_arrow_down.png b/editor/icons/icon_GUI_tree_arrow_down.png new file mode 100644 index 0000000000..4ef7b41de6 Binary files /dev/null and b/editor/icons/icon_GUI_tree_arrow_down.png differ diff --git a/editor/icons/icon_GUI_tree_arrow_right.png b/editor/icons/icon_GUI_tree_arrow_right.png new file mode 100644 index 0000000000..13a42f730d Binary files /dev/null and b/editor/icons/icon_GUI_tree_arrow_right.png differ diff --git a/editor/icons/icon_GUI_unchecked.png b/editor/icons/icon_GUI_unchecked.png new file mode 100644 index 0000000000..8341cdc643 Binary files /dev/null and b/editor/icons/icon_GUI_unchecked.png differ diff --git a/editor/icons/icon_GUI_vslider_bg.png b/editor/icons/icon_GUI_vslider_bg.png new file mode 100644 index 0000000000..fa8c6cac1f Binary files /dev/null and b/editor/icons/icon_GUI_vslider_bg.png differ diff --git a/editor/icons/icon_GUI_vsplit_bg.png b/editor/icons/icon_GUI_vsplit_bg.png new file mode 100644 index 0000000000..0c29b1e35c Binary files /dev/null and b/editor/icons/icon_GUI_vsplit_bg.png differ diff --git a/editor/icons/icon_GUI_vsplitter.png b/editor/icons/icon_GUI_vsplitter.png new file mode 100644 index 0000000000..56fb20bc3f Binary files /dev/null and b/editor/icons/icon_GUI_vsplitter.png differ diff --git a/editor/icons/icon_gui_close_dark.png b/editor/icons/icon_gui_close_dark.png new file mode 100644 index 0000000000..8f1d7d8b2c Binary files /dev/null and b/editor/icons/icon_gui_close_dark.png differ diff --git a/editor/icons/icon_gui_close_light.png b/editor/icons/icon_gui_close_light.png new file mode 100644 index 0000000000..b8e3a80e3b Binary files /dev/null and b/editor/icons/icon_gui_close_light.png differ diff --git a/editor/icons/icon_help.png b/editor/icons/icon_help.png index f05b512f4c..d70807000e 100644 Binary files a/editor/icons/icon_help.png and b/editor/icons/icon_help.png differ diff --git a/editor/icons/icon_help_search.png b/editor/icons/icon_help_search.png new file mode 100644 index 0000000000..7a1506853e Binary files /dev/null and b/editor/icons/icon_help_search.png differ diff --git a/editor/icons/source/icon_GUI_checked.svg b/editor/icons/source/icon_GUI_checked.svg new file mode 100644 index 0000000000..6d2c03f4c5 --- /dev/null +++ b/editor/icons/source/icon_GUI_checked.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_dropdown.svg b/editor/icons/source/icon_GUI_dropdown.svg new file mode 100644 index 0000000000..f313b09983 --- /dev/null +++ b/editor/icons/source/icon_GUI_dropdown.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_hslider_bg.svg b/editor/icons/source/icon_GUI_hslider_bg.svg new file mode 100644 index 0000000000..a920bf34ab --- /dev/null +++ b/editor/icons/source/icon_GUI_hslider_bg.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_hsplitter.svg b/editor/icons/source/icon_GUI_hsplitter.svg new file mode 100644 index 0000000000..01c893fc56 --- /dev/null +++ b/editor/icons/source/icon_GUI_hsplitter.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_option_arrow.svg b/editor/icons/source/icon_GUI_option_arrow.svg new file mode 100644 index 0000000000..5cd943e9e3 --- /dev/null +++ b/editor/icons/source/icon_GUI_option_arrow.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_play_button_group.svg b/editor/icons/source/icon_GUI_play_button_group.svg new file mode 100644 index 0000000000..84bdb00505 --- /dev/null +++ b/editor/icons/source/icon_GUI_play_button_group.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_progress_bar.svg b/editor/icons/source/icon_GUI_progress_bar.svg new file mode 100644 index 0000000000..1edd33dd85 --- /dev/null +++ b/editor/icons/source/icon_GUI_progress_bar.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_progress_fill.svg b/editor/icons/source/icon_GUI_progress_fill.svg new file mode 100644 index 0000000000..cf55c55ab1 --- /dev/null +++ b/editor/icons/source/icon_GUI_progress_fill.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_scroll_bg.svg b/editor/icons/source/icon_GUI_scroll_bg.svg new file mode 100644 index 0000000000..29604b9e14 --- /dev/null +++ b/editor/icons/source/icon_GUI_scroll_bg.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + diff --git a/editor/icons/source/icon_GUI_scroll_grabber.svg b/editor/icons/source/icon_GUI_scroll_grabber.svg new file mode 100644 index 0000000000..b9d2bbbec0 --- /dev/null +++ b/editor/icons/source/icon_GUI_scroll_grabber.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_scroll_grabber_hl.svg b/editor/icons/source/icon_GUI_scroll_grabber_hl.svg new file mode 100644 index 0000000000..ce9a66c5bc --- /dev/null +++ b/editor/icons/source/icon_GUI_scroll_grabber_hl.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_slider_grabber.svg b/editor/icons/source/icon_GUI_slider_grabber.svg new file mode 100644 index 0000000000..fb6c9d1c5c --- /dev/null +++ b/editor/icons/source/icon_GUI_slider_grabber.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_slider_grabber_hl.svg b/editor/icons/source/icon_GUI_slider_grabber_hl.svg new file mode 100644 index 0000000000..c7e9018ac3 --- /dev/null +++ b/editor/icons/source/icon_GUI_slider_grabber_hl.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_spinbox_updown.svg b/editor/icons/source/icon_GUI_spinbox_updown.svg new file mode 100644 index 0000000000..e29d7fe0d2 --- /dev/null +++ b/editor/icons/source/icon_GUI_spinbox_updown.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_tab_menu.svg b/editor/icons/source/icon_GUI_tab_menu.svg new file mode 100644 index 0000000000..39e0d1f261 --- /dev/null +++ b/editor/icons/source/icon_GUI_tab_menu.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_toggle_off.svg b/editor/icons/source/icon_GUI_toggle_off.svg new file mode 100644 index 0000000000..f0cf10a653 --- /dev/null +++ b/editor/icons/source/icon_GUI_toggle_off.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_toggle_on.svg b/editor/icons/source/icon_GUI_toggle_on.svg new file mode 100644 index 0000000000..79715dd767 --- /dev/null +++ b/editor/icons/source/icon_GUI_toggle_on.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_tree_arrow_down.svg b/editor/icons/source/icon_GUI_tree_arrow_down.svg new file mode 100644 index 0000000000..1dd209720f --- /dev/null +++ b/editor/icons/source/icon_GUI_tree_arrow_down.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_tree_arrow_right.svg b/editor/icons/source/icon_GUI_tree_arrow_right.svg new file mode 100644 index 0000000000..43134ba1b1 --- /dev/null +++ b/editor/icons/source/icon_GUI_tree_arrow_right.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_unchecked.svg b/editor/icons/source/icon_GUI_unchecked.svg new file mode 100644 index 0000000000..053cbe6de5 --- /dev/null +++ b/editor/icons/source/icon_GUI_unchecked.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_vslider_bg.svg b/editor/icons/source/icon_GUI_vslider_bg.svg new file mode 100644 index 0000000000..cfa4feeca6 --- /dev/null +++ b/editor/icons/source/icon_GUI_vslider_bg.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_vsplit_bg.svg b/editor/icons/source/icon_GUI_vsplit_bg.svg new file mode 100644 index 0000000000..e11940cf53 --- /dev/null +++ b/editor/icons/source/icon_GUI_vsplit_bg.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_GUI_vsplitter.svg b/editor/icons/source/icon_GUI_vsplitter.svg new file mode 100644 index 0000000000..80f7c2ce12 --- /dev/null +++ b/editor/icons/source/icon_GUI_vsplitter.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_gui_close_dark.svg b/editor/icons/source/icon_gui_close_dark.svg new file mode 100644 index 0000000000..ccb4239784 --- /dev/null +++ b/editor/icons/source/icon_gui_close_dark.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_gui_close_light.svg b/editor/icons/source/icon_gui_close_light.svg new file mode 100644 index 0000000000..90d811965b --- /dev/null +++ b/editor/icons/source/icon_gui_close_light.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_help.svg b/editor/icons/source/icon_help.svg index 01e85e0f55..cc8517d2d1 100644 --- a/editor/icons/source/icon_help.svg +++ b/editor/icons/source/icon_help.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92+devel unknown" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_help.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="31.999999" - inkscape:cx="5.4018713" - inkscape:cy="8.2308388" + inkscape:cx="9.7940153" + inkscape:cy="7.5068869" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -46,7 +46,8 @@ inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" - inkscape:window-maximized="1"> + inkscape:window-maximized="1" + inkscape:document-rotation="0"> @@ -59,7 +60,7 @@ image/svg+xml - + @@ -69,42 +70,9 @@ id="layer1" transform="translate(0,-1036.3622)"> - - - - + id="path4270" /> diff --git a/editor/icons/source/icon_help_search.svg b/editor/icons/source/icon_help_search.svg new file mode 100644 index 0000000000..ab914c0c64 --- /dev/null +++ b/editor/icons/source/icon_help_search.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index dc2eddda39..d10831eea1 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -1056,7 +1056,7 @@ void ScriptEditor::_notification(int p_what) { } EditorSettings::get_singleton()->connect("settings_changed", this, "_editor_settings_changed"); - help_search->set_icon(get_icon("Help", "EditorIcons")); + help_search->set_icon(get_icon("HelpSearch", "EditorIcons")); site_search->set_icon(get_icon("Instance", "EditorIcons")); class_search->set_icon(get_icon("ClassList", "EditorIcons")); @@ -2172,11 +2172,17 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { members_overview_enabled = true; editor = p_editor; + Ref sb = p_editor->get_gui_base()->get_stylebox("panel", "TabContainer")->duplicate(); + sb->set_default_margin(MARGIN_TOP, 0); + add_style_override("panel", sb); + VBoxContainer *main_container = memnew(VBoxContainer); + add_child(main_container); + menu_hb = memnew(HBoxContainer); - add_child(menu_hb); + main_container->add_child(menu_hb); script_split = memnew(HSplitContainer); - add_child(script_split); + main_container->add_child(script_split); script_split->set_v_size_flags(SIZE_EXPAND_FILL); list_split = memnew(VSplitContainer); diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h index 7f17365931..010a5604ec 100644 --- a/editor/plugins/script_editor_plugin.h +++ b/editor/plugins/script_editor_plugin.h @@ -115,9 +115,9 @@ typedef ScriptEditorBase *(*CreateScriptEditorFunc)(const Ref