diff --git a/editor/animation_editor.cpp b/editor/animation_editor.cpp index 447f57a73f4..57253688718 100644 --- a/editor/animation_editor.cpp +++ b/editor/animation_editor.cpp @@ -1035,7 +1035,7 @@ void AnimationKeyEditor::_track_pos_draw() { //draw position int pixel = (timeline_pos - h_scroll->get_value()) * zoom_scale; pixel += name_limit; - track_pos->draw_line(ofs + Point2(pixel, 0), ofs + Point2(pixel, size.height), Color(1, 0.3, 0.3, 0.8)); + track_pos->draw_line(ofs + Point2(pixel, 0), ofs + Point2(pixel, size.height), get_color("highlight_color", "Editor")); } } @@ -1089,13 +1089,12 @@ void AnimationKeyEditor::_track_editor_draw() { int sep = get_constant("vseparation", "Tree"); int hsep = get_constant("hseparation", "Tree"); Color color = get_color("font_color", "Tree"); - Color sepcolor = get_color("guide_color", "Tree"); - Color timecolor = get_color("prop_subsection", "Editor"); - timecolor = Color::html("ff4a414f"); + Color sepcolor = get_color("light_color_1", "Editor"); + Color timecolor = get_color("dark_color_2", "Editor"); Color hover_color = Color(1, 1, 1, 0.05); Color select_color = Color(1, 1, 1, 0.1); Color invalid_path_color = Color(1, 0.6, 0.4, 0.5); - Color track_select_color = Color::html("ffbd8e8e"); + Color track_select_color = get_color("highlight_color", "Editor"); Ref remove_icon = get_icon("Remove", "EditorIcons"); Ref move_up_icon = get_icon("MoveUp", "EditorIcons"); @@ -1179,11 +1178,7 @@ void AnimationKeyEditor::_track_editor_draw() { int end_px = (l - h_scroll->get_value()) * scale; int begin_px = -h_scroll->get_value() * scale; - Color notimecol; - notimecol.r = timecolor.gray(); - notimecol.g = notimecol.r; - notimecol.b = notimecol.r; - notimecol.a = timecolor.a; + Color notimecol = get_color("light_color_1", "Editor"); { @@ -1483,7 +1478,9 @@ void AnimationKeyEditor::_track_editor_draw() { switch (click.click) { case ClickOver::CLICK_SELECT_KEYS: { - te->draw_rect(Rect2(click.at, click.to - click.at), Color(0.7, 0.7, 1.0, 0.5)); + Color box_color = get_color("highlight_color", "Editor"); + box_color.a = 0.35; + te->draw_rect(Rect2(click.at, click.to - click.at), box_color); } break; case ClickOver::CLICK_MOVE_KEYS: { @@ -2891,6 +2888,8 @@ void AnimationKeyEditor::_notification(int p_what) { key_editor->edit(key_edit); zoomicon->set_texture(get_icon("Zoom", "EditorIcons")); + zoomicon->set_custom_minimum_size(Size2(24 * EDSCALE, 0)); + zoomicon->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED); menu_add_track->set_icon(get_icon("AddTrack", "EditorIcons")); menu_add_track->get_popup()->add_icon_item(get_icon("KeyValue", "EditorIcons"), "Add Normal Track", ADD_TRACK_MENU_ADD_VALUE_TRACK); @@ -3928,6 +3927,7 @@ AnimationKeyEditor::AnimationKeyEditor() { v_scroll->set_value(0); key_editor_tab = memnew(TabContainer); + key_editor_tab->set_tab_align(TabContainer::ALIGN_LEFT); hb->add_child(key_editor_tab); key_editor_tab->set_custom_minimum_size(Size2(200, 0)); diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index 93c2b7493c7..4b60c497c35 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -419,6 +419,10 @@ void ConnectionsDock::_notification(int p_what) { //RID ci = get_canvas_item(); //get_stylebox("panel","PopupMenu")->draw(ci,Rect2(Point2(),get_size())); } + + if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { + update_tree(); + } } void ConnectionsDock::_close() { diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index c15eac67fbb..5d13c7c2544 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -87,6 +87,9 @@ void EditorLog::_notification(int p_what) { log->add_color_override("default_color", get_color("font_color", "Tree")); //button->set_icon(get_icon("Console","EditorIcons")); } + if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { + _override_logger_styles(); + } /*if (p_what==NOTIFICATION_DRAW) { diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 416570375ef..0128b4eaec2 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -356,11 +356,17 @@ void EditorNode::_notification(int p_what) { if (p_what == MainLoop::NOTIFICATION_WM_QUIT_REQUEST) { _menu_option_confirm(FILE_QUIT, false); - }; + } 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 = create_editor_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")); + 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")); } } @@ -2699,6 +2705,8 @@ void EditorNode::add_editor_plugin(EditorPlugin *p_editor) { tb->set_toggle_mode(true); tb->connect("pressed", singleton, "_editor_select", varray(singleton->main_editor_buttons.size())); tb->set_text(p_editor->get_name()); + tb->set_icon(p_editor->get_base_control()->get_icon(p_editor->get_name(), "EditorIcons")); + tb->set_name(p_editor->get_name()); singleton->main_editor_buttons.push_back(tb); singleton->main_editor_button_vb->add_child(tb); singleton->editor_table.push_back(p_editor); @@ -4682,6 +4690,23 @@ void EditorNode::_dim_timeout() { } } +void EditorNode::_check_gui_base_size() { + print_line(itos(int(gui_base->get_size().width))); + if (gui_base->get_size().width > 1200 * EDSCALE) { + for (int i = 0; i < singleton->main_editor_button_vb->get_child_count(); i++) { + ToolButton *btn = singleton->main_editor_button_vb->get_child(i)->cast_to(); + 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 = singleton->main_editor_button_vb->get_child(i)->cast_to(); + if (btn == singleton->distraction_free) continue; + btn->set_text(""); + } + } +} + void EditorNode::open_export_template_manager() { export_template_manager->popup_manager(); @@ -4764,6 +4789,7 @@ 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); ADD_SIGNAL(MethodInfo("play_pressed")); ADD_SIGNAL(MethodInfo("pause_pressed")); @@ -4893,17 +4919,19 @@ EditorNode::EditorNode() { ClassDB::set_class_enabled("CollisionShape2D", true); ClassDB::set_class_enabled("CollisionPolygon2D", true); - Control *theme_base = memnew(Control); + theme_base = memnew(Control); add_child(theme_base); theme_base->set_area_as_parent_rect(); 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 = create_editor_theme(); theme_base->set_theme(theme); gui_base->set_theme(create_custom_theme()); + gui_base->add_style_override("panel", gui_base->get_stylebox("Background", "EditorStyles")); resource_preview = memnew(EditorResourcePreview); add_child(resource_preview); @@ -4918,6 +4946,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); #if 0 PanelContainer *top_dark_panel = memnew( PanelContainer ); @@ -5054,7 +5083,7 @@ EditorNode::EditorNode() { dock_slot[i]->set_v_size_flags(Control::SIZE_EXPAND_FILL); dock_slot[i]->set_popup(dock_select_popoup); dock_slot[i]->connect("pre_popup_pressed", this, "_dock_pre_popup", varray(i)); - //dock_slot[i]->set_tab_align(TabContainer::ALIGN_LEFT); + dock_slot[i]->set_tab_align(TabContainer::ALIGN_LEFT); } dock_drag_timer = memnew(Timer); @@ -5079,7 +5108,7 @@ EditorNode::EditorNode() { */ scene_tabs = memnew(Tabs); scene_tabs->add_tab("unsaved"); - scene_tabs->set_tab_align(Tabs::ALIGN_CENTER); + scene_tabs->set_tab_align(Tabs::ALIGN_LEFT); 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)); scene_tabs->connect("tab_changed", this, "_scene_tab_changed"); scene_tabs->connect("right_button_pressed", this, "_scene_tab_script_edited"); @@ -5089,7 +5118,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("EditorPanel", "EditorStyles")); + scene_root_parent->add_style_override("panel", gui_base->get_stylebox("Content", "EditorStyles")); //Ref sp = scene_root_parent->get_stylebox("panel","TabContainer"); //scene_root_parent->add_style_override("panel",sp); @@ -5122,7 +5151,7 @@ EditorNode::EditorNode() { scene_root_parent->add_child(viewport); PanelContainer *top_region = memnew(PanelContainer); - top_region->add_style_override("panel", gui_base->get_stylebox("hover", "Button")); + top_region->add_style_override("panel", gui_base->get_stylebox("MenuPanel", "EditorStyles")); HBoxContainer *left_menu_hb = memnew(HBoxContainer); top_region->add_child(left_menu_hb); menu_hb->add_child(top_region); @@ -5133,6 +5162,7 @@ EditorNode::EditorNode() { file_menu->set_text(TTR("Scene")); //file_menu->set_icon(gui_base->get_icon("Save","EditorIcons")); left_menu_hb->add_child(file_menu); + file_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); prev_scene = memnew(ToolButton); prev_scene->set_icon(gui_base->get_icon("PrevScene", "EditorIcons")); @@ -5205,7 +5235,6 @@ EditorNode::EditorNode() { } PanelContainer *editor_region = memnew(PanelContainer); - editor_region->add_style_override("panel", gui_base->get_stylebox("hover", "Button")); main_editor_button_vb = memnew(HBoxContainer); editor_region->add_child(main_editor_button_vb); menu_hb->add_child(editor_region); @@ -5249,6 +5278,7 @@ EditorNode::EditorNode() { tool_menu = memnew(MenuButton); tool_menu->set_tooltip(TTR("Miscellaneous project or scene-wide tools.")); tool_menu->set_text(TTR("Tools")); + tool_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); //tool_menu->set_icon(gui_base->get_icon("Save","EditorIcons")); left_menu_hb->add_child(tool_menu); @@ -5262,6 +5292,7 @@ EditorNode::EditorNode() { export_button->set_text(TTR("Export")); export_button->connect("pressed", this, "_menu_option", varray(FILE_EXPORT_PROJECT)); export_button->set_focus_mode(Control::FOCUS_NONE); + export_button->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); left_menu_hb->add_child(export_button); menu_hb->add_spacer(); @@ -5278,12 +5309,12 @@ EditorNode::EditorNode() { play_cc->set_anchor_and_margin(MARGIN_BOTTOM, Control::ANCHOR_BEGIN, 10); play_cc->set_margin(MARGIN_TOP, 5); - top_region = memnew(PanelContainer); - top_region->add_style_override("panel", gui_base->get_stylebox("hover", "Button")); - play_cc->add_child(top_region); + play_button_panel = memnew(PanelContainer); + play_button_panel->add_style_override("panel", gui_base->get_stylebox("PlayButtonPanel", "EditorStyles")); + play_cc->add_child(play_button_panel); HBoxContainer *play_hb = memnew(HBoxContainer); - top_region->add_child(play_hb); + play_button_panel->add_child(play_hb); play_button = memnew(ToolButton); play_hb->add_child(play_button); @@ -5399,7 +5430,6 @@ EditorNode::EditorNode() { } PanelContainer *vu_cont = memnew(PanelContainer); - vu_cont->add_style_override("panel", gui_base->get_stylebox("hover", "Button")); menu_hb->add_child(vu_cont); audio_vu = memnew(TextureProgress); @@ -5420,13 +5450,13 @@ EditorNode::EditorNode() { } top_region = memnew(PanelContainer); - top_region->add_style_override("panel", gui_base->get_stylebox("hover", "Button")); HBoxContainer *right_menu_hb = memnew(HBoxContainer); top_region->add_child(right_menu_hb); menu_hb->add_child(top_region); settings_menu = memnew(MenuButton); settings_menu->set_text(TTR("Settings")); + settings_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); //settings_menu->set_anchor(MARGIN_RIGHT,ANCHOR_END); right_menu_hb->add_child(settings_menu); p = settings_menu->get_popup(); @@ -5676,7 +5706,7 @@ EditorNode::EditorNode() { _update_layouts_menu(); bottom_panel = memnew(PanelContainer); - bottom_panel->add_style_override("panel", gui_base->get_stylebox("EditorPanel", "EditorStyles")); + bottom_panel->add_style_override("panel", gui_base->get_stylebox("Content", "EditorStyles")); center_split->add_child(bottom_panel); center_split->set_dragger_visibility(SplitContainer::DRAGGER_HIDDEN); diff --git a/editor/editor_node.h b/editor/editor_node.h index 7de713eae9b..62357438438 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -205,8 +205,10 @@ private: //Ref scene_import_metadata; PanelContainer *scene_root_parent; + Control *theme_base; Control *gui_base; VBoxContainer *main_vbox; + PanelContainer *play_button_panel; //split @@ -604,6 +606,7 @@ private: void _start_dimming(bool p_dimming); void _dim_timeout(); + void _check_gui_base_size(); protected: void _notification(int p_what); diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 9a8aa22b6b3..fa35a42d31c 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -599,6 +599,11 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { set("editors/poly_editor/point_grab_radius", 8); + set("editors/theme/base_color", Color(0.3, 0.3, 0.3, 1)); + hints["editors/theme/base_color"] = PropertyInfo(Variant::COLOR, "editors/theme/base_color", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); + set("editors/theme/contrast", 0.2); + hints["editors/theme/contrast"] = PropertyInfo(Variant::REAL, "editors/theme/contrast", PROPERTY_HINT_RANGE, "0.01, 1, 0.01"); + set("run/window_placement/rect", 0); hints["run/window_placement/rect"] = PropertyInfo(Variant::INT, "run/window_placement/rect", PROPERTY_HINT_ENUM, "Default,Centered,Custom Position,Force Maximized,Force Full Screen"); String screen_hints = TTR("Default (Same as Editor)"); diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 3b5dbf7fc77..c7a41e4441f 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -35,25 +35,383 @@ #include "editor_scale.h" #include "editor_settings.h" +static Ref make_stylebox(Ref texture, float p_left, float p_top, float p_right, float p_botton, float p_margin_left = -1, float p_margin_top = -1, float p_margin_right = -1, float p_margin_botton = -1, bool p_draw_center = true) { + Ref style(memnew(StyleBoxTexture)); + style->set_texture(texture); + style->set_margin_size(MARGIN_LEFT, p_left * EDSCALE); + style->set_margin_size(MARGIN_RIGHT, p_right * EDSCALE); + style->set_margin_size(MARGIN_BOTTOM, p_botton * EDSCALE); + style->set_margin_size(MARGIN_TOP, p_top * EDSCALE); + style->set_default_margin(MARGIN_LEFT, p_margin_left * EDSCALE); + style->set_default_margin(MARGIN_RIGHT, p_margin_right * EDSCALE); + style->set_default_margin(MARGIN_BOTTOM, p_margin_botton * EDSCALE); + style->set_default_margin(MARGIN_TOP, p_margin_top * EDSCALE); + style->set_draw_center(p_draw_center); + return style; +} + +static Ref make_empty_stylebox(float p_margin_left = -1, float p_margin_top = -1, float p_margin_right = -1, float p_margin_bottom = -1) { + Ref style(memnew(StyleBoxEmpty)); + style->set_default_margin(MARGIN_LEFT, p_margin_left * EDSCALE); + style->set_default_margin(MARGIN_RIGHT, p_margin_right * EDSCALE); + style->set_default_margin(MARGIN_BOTTOM, p_margin_bottom * EDSCALE); + style->set_default_margin(MARGIN_TOP, p_margin_top * EDSCALE); + return style; +} + +static Ref make_flat_stylebox(Color color, float p_margin_left = -1, float p_margin_top = -1, float p_margin_right = -1, float p_margin_bottom = -1) { + Ref style(memnew(StyleBoxFlat)); + style->set_bg_color(color); + style->set_default_margin(MARGIN_LEFT, p_margin_left * EDSCALE); + style->set_default_margin(MARGIN_RIGHT, p_margin_right * EDSCALE); + style->set_default_margin(MARGIN_BOTTOM, p_margin_bottom * EDSCALE); + style->set_default_margin(MARGIN_TOP, p_margin_top * EDSCALE); + return style; +} + +static Ref change_border_color(Ref p_style, Color p_color) { + Ref style = p_style->duplicate(); + style->set_light_color(p_color); + style->set_dark_color(p_color); + return style; +} + +static Ref add_additional_border(Ref p_style, int p_left, int p_top, int p_right, int p_bottom) { + Ref style = p_style->duplicate(); + style->_set_additional_border_size(MARGIN_LEFT, p_left * EDSCALE); + style->_set_additional_border_size(MARGIN_RIGHT, p_right * EDSCALE); + style->_set_additional_border_size(MARGIN_TOP, p_top * EDSCALE); + style->_set_additional_border_size(MARGIN_BOTTOM, p_bottom * EDSCALE); + return style; +} + +#define HIGHLIGHT_COLOR_LIGHT highlight_color.linear_interpolate(Color(1, 1, 1, 1), 0.3) +#define HIGHLIGHT_COLOR_DARK highlight_color.linear_interpolate(Color(0, 0, 0, 1), 0.5) + Ref create_editor_theme() { Ref theme = Ref(memnew(Theme)); editor_register_fonts(theme); editor_register_icons(theme); - Ref focus_sbt = memnew(StyleBoxTexture); - focus_sbt->set_texture(theme->get_icon("EditorFocus", "EditorIcons")); - for (int i = 0; i < 4; i++) { - focus_sbt->set_margin_size(Margin(i), 16 * EDSCALE); - focus_sbt->set_default_margin(Margin(i), 16 * EDSCALE); - } + // Define colors + Color highlight_color = EDITOR_DEF("editors/theme/highlight_color", Color::html("#6ca9f3")); + Color base_color = EDITOR_DEF("editors/theme/base_color", Color::html("#2e3742")); + float contrast = EDITOR_DEF("editors/theme/contrast", 0.2); + + Color dark_color_1 = base_color.linear_interpolate(Color(0, 0, 0, 1), contrast); + Color dark_color_2 = base_color.linear_interpolate(Color(0, 0, 0, 1), contrast * 2); + Color dark_color_3 = base_color.linear_interpolate(Color(0, 0, 0, 1), contrast * 3); + + 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 * 2); + + 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); + theme->set_color("dark_color_2", "Editor", dark_color_2); + theme->set_color("dark_color_3", "Editor", dark_color_3); + theme->set_color("light_color_1", "Editor", light_color_1); + 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")); + + // Editor background + Ref style_background = make_flat_stylebox(dark_color_2, 4, 4, 4, 4); + theme->set_stylebox("Background", "EditorStyles", style_background); + + // Focus + Ref focus_sbt = make_flat_stylebox(light_color_1, 4, 4, 4, 4); focus_sbt->set_draw_center(false); - theme->set_stylebox("EditorFocus", "EditorStyles", focus_sbt); - theme->set_color("prop_category", "Editor", Color::hex(0x3f3a44ff)); - theme->set_color("prop_section", "Editor", Color::hex(0x35313aff)); - theme->set_color("prop_subsection", "Editor", Color::hex(0x312e37ff)); + focus_sbt->set_border_size(1 * EDSCALE); + focus_sbt = change_border_color(focus_sbt, light_color_2); + theme->set_stylebox("Focus", "EditorStyles", focus_sbt); + + // Menu + Ref style_menu = make_empty_stylebox(4, 4, 4, 4); + theme->set_stylebox("panel", "PanelContainer", style_menu); + 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)); + + 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); + theme->set_stylebox("normal", "MenuButton", style_menu); + theme->set_stylebox("hover", "MenuButton", style_menu); + theme->set_stylebox("pressed", "MenuButton", style_menu); + theme->set_stylebox("focus", "MenuButton", style_menu); + theme->set_stylebox("disabled", "MenuButton", style_menu); + + theme->set_stylebox("normal", "PopupMenu", style_menu); + theme->set_stylebox("hover", "PopupMenu", style_menu_hover_bg); + theme->set_stylebox("pressed", "PopupMenu", style_menu); + theme->set_stylebox("focus", "PopupMenu", style_menu); + theme->set_stylebox("disabled", "PopupMenu", style_menu); + + theme->set_stylebox("normal", "ToolButton", style_menu); + theme->set_stylebox("hover", "ToolButton", style_menu); + theme->set_stylebox("pressed", "ToolButton", style_menu); + theme->set_stylebox("focus", "ToolButton", style_menu); + theme->set_stylebox("disabled", "ToolButton", style_menu); + + theme->set_color("font_color_hover", "MenuButton", HIGHLIGHT_COLOR_LIGHT); + theme->set_color("font_color_hover", "ToolButton", HIGHLIGHT_COLOR_LIGHT); + theme->set_color("font_color_pressed", "ToolButton", highlight_color); + + theme->set_stylebox("MenuHover", "EditorStyles", style_menu_hover_border); + + // Content of each tab + Ref style_panel = make_flat_stylebox(base_color, 1, 4, 1, 1); + theme->set_stylebox("panel", "TabContainer", style_panel); + theme->set_stylebox("Content", "EditorStyles", style_panel); + + // 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_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); + // make icon color value bigger because icon image is not complete white + theme->set_color("icon_color_pressed", "Button", Color(highlight_color.r * 1.15, highlight_color.g * 1.15, highlight_color.b * 1.15, highlight_color.a)); + + // 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_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")); + + // 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_light_color(light_color_1); + style_popup_menu->set_dark_color(light_color_1); + theme->set_stylebox("panel", "PopupMenu", style_popup_menu); + + // Tree & script background + Ref style_bg = make_flat_stylebox(dark_color_1, 0, 0, 0, 0); + theme->set_stylebox("bg", "Tree", style_bg); + theme->set_stylebox("ScriptPanel", "EditorStyles", style_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_stylebox("bg_focus", "Tree", focus_sbt); + + Ref style_tree_btn = make_flat_stylebox(light_color_1, 2, 4, 2, 4); + theme->set_stylebox("button_pressed", "Tree", style_tree_btn); + + Ref style_tree_focus = make_flat_stylebox(HIGHLIGHT_COLOR_DARK, 4, 4, 4, 4); + theme->set_stylebox("selected_focus", "Tree", style_tree_focus); + + Ref style_tree_selected = make_flat_stylebox(light_color_1, 4, 4, 4, 4); + theme->set_stylebox("selected", "Tree", style_tree_selected); + + 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_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); + theme->set_stylebox("cursor", "Tree", style_tree_cursor); + theme->set_stylebox("cursor_unfocused", "Tree", style_tree_cursor); + theme->set_stylebox("title_button_normal", "Tree", style_tree_title); + theme->set_stylebox("title_button_hover", "Tree", style_tree_title); + theme->set_stylebox("title_button_pressed", "Tree", style_tree_title); + + theme->set_color("prop_category", "Editor", dark_color_3); + theme->set_color("prop_section", "Editor", dark_color_1); + theme->set_color("prop_subsection", "Editor", dark_color_2); theme->set_color("fg_selected", "Editor", Color::html("ffbd8e8e")); theme->set_color("fg_error", "Editor", Color::html("ffbd8e8e")); + theme->set_color("drop_position_color", "Tree", highlight_color); + + // ItemList + Ref style_itemlist_cursor = make_flat_stylebox(highlight_color, 8, 8, 8, 8); + style_itemlist_cursor->set_draw_center(false); + style_itemlist_cursor->set_border_size(1 * EDSCALE); + style_itemlist_cursor->set_light_color(light_color_1); + style_itemlist_cursor->set_dark_color(light_color_1); + theme->set_stylebox("cursor", "ItemList", style_itemlist_cursor); + theme->set_stylebox("cursor_unfocused", "ItemList", style_itemlist_cursor); + theme->set_stylebox("selected_focus", "ItemList", style_tree_focus); + theme->set_stylebox("selected", "ItemList", style_tree_selected); + theme->set_stylebox("bg_focus", "ItemList", focus_sbt); + theme->set_stylebox("bg", "ItemList", style_bg); + + Ref style_tab_fg = make_flat_stylebox(base_color, 15, 5, 15, 5); + Ref style_tab_bg = make_flat_stylebox(base_color, 15, 5, 15, 5); + style_tab_bg->set_draw_center(false); + + // Tabs & TabContainer + theme->set_stylebox("tab_fg", "TabContainer", style_tab_fg); + 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_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")); + + // Debugger + Ref style_panel_debugger = make_flat_stylebox(dark_color_2, 0, 4, 0, 0); + theme->set_stylebox("DebuggerPanel", "EditorStyles", style_panel_debugger); + + Ref style_tab_fg_debugger = make_flat_stylebox(dark_color_2, 10, 5, 10, 5); + Ref style_tab_bg_debugger = make_flat_stylebox(dark_color_2, 10, 5, 10, 5); + style_tab_bg_debugger->set_draw_center(false); + + theme->set_stylebox("DebuggerTabFG", "EditorStyles", style_tab_fg_debugger); + 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); + style_lineedit->set_light_color(light_color_1); + style_lineedit->set_dark_color(light_color_1); + Ref style_lineedit_disabled = style_lineedit->duplicate(); + style_lineedit_disabled->set_bg_color(light_color_2); + theme->set_stylebox("normal", "LineEdit", style_lineedit); + theme->set_stylebox("focus", "LineEdit", change_border_color(style_lineedit, highlight_color)); + theme->set_stylebox("read_only", "LineEdit", style_lineedit_disabled); + + // TextEdit + Ref style_textedit_normal(memnew(StyleBoxFlat)); + style_textedit_normal->set_bg_color(dark_color_2); + style_textedit_normal->set_default_margin(MARGIN_LEFT, 0); + style_textedit_normal->set_default_margin(MARGIN_RIGHT, 0); + style_textedit_normal->set_default_margin(MARGIN_BOTTOM, 0); + style_textedit_normal->set_default_margin(MARGIN_TOP, 0); + theme->set_stylebox("normal", "TextEdit", style_textedit_normal); + theme->set_stylebox("focus", "TextEdit", focus_sbt); + 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_icon("grabber", "VSplitContainer", theme->get_icon("Vsplitter", "EditorIcons")); + theme->set_icon("grabber", "HSplitContainer", theme->get_icon("Hsplitter", "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_blend(false); + style_window->set_light_color(light_color_2); + style_window->set_dark_color(light_color_2); + style_window->_set_additional_border_size(MARGIN_TOP, 24 * EDSCALE); + theme->set_stylebox("panel", "WindowDialog", style_window); + + // 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_icon("increment", "HScrollBar", empty_icon); + theme->set_icon("increment_highlight", "HScrollBar", empty_icon); + theme->set_icon("decrement", "HScrollBar", empty_icon); + 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_icon("increment", "VScrollBar", empty_icon); + theme->set_icon("increment_highlight", "VScrollBar", empty_icon); + theme->set_icon("decrement", "VScrollBar", empty_icon); + 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")); + + // 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")); + + // 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_blend(false); + style_tooltip->set_light_color(Color(1, 1, 1, 0.9)); + style_tooltip->set_dark_color(Color(1, 1, 1, 0.9)); + theme->set_stylebox("panel", "TooltipPanel", style_tooltip); + + // PopupPanel + Ref style_dock_select = make_flat_stylebox(base_color); + style_dock_select->set_light_color(light_color_1); + style_dock_select->set_dark_color(light_color_1); + style_dock_select = add_additional_border(style_dock_select, 2, 2, 2, 2); + theme->set_stylebox("panel", "PopupPanel", style_dock_select); + + // SpinBox + theme->set_icon("updown", "SpinBox", theme->get_icon("SpinboxUpdown", "EditorIcons")); + + // 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_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_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_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_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); + theme->set_stylebox("frame", "GraphNode", graphsb); + theme->set_stylebox("selectedframe", "GraphNode", graphsbselected); + theme->set_stylebox("comment", "GraphNode", graphsbcomment); + theme->set_stylebox("commentfocus", "GraphNode", graphsbcommentselected); return theme; } diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 44ddfca21a0..800127e6c4c 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -1723,7 +1723,6 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { tree->connect("item_rmb_selected", this, "_dir_rmb_pressed"); files = memnew(ItemList); - files->add_style_override("bg", editor->get_gui_base()->get_stylebox("EditorBG", "EditorStyles")); files->set_v_size_flags(SIZE_EXPAND_FILL); files->set_select_mode(ItemList::SELECT_MULTI); files->set_drag_forwarding(this); diff --git a/editor/icons/2x/icon_2_d.png b/editor/icons/2x/icon_2_d.png new file mode 100644 index 00000000000..9b2ed646653 Binary files /dev/null and b/editor/icons/2x/icon_2_d.png differ diff --git a/editor/icons/2x/icon_3_d.png b/editor/icons/2x/icon_3_d.png new file mode 100644 index 00000000000..218c246870f Binary files /dev/null and b/editor/icons/2x/icon_3_d.png differ diff --git a/editor/icons/2x/icon_animation_player.png b/editor/icons/2x/icon_animation_player.png index 4a3209ab70e..1a9373938b5 100644 Binary files a/editor/icons/2x/icon_animation_player.png and b/editor/icons/2x/icon_animation_player.png differ diff --git a/editor/icons/2x/icon_animation_tree.png b/editor/icons/2x/icon_animation_tree.png index a213ab6e5eb..a1dd4f137f7 100644 Binary files a/editor/icons/2x/icon_animation_tree.png and b/editor/icons/2x/icon_animation_tree.png differ diff --git a/editor/icons/2x/icon_animation_tree_player.png b/editor/icons/2x/icon_animation_tree_player.png index a213ab6e5eb..a1dd4f137f7 100644 Binary files a/editor/icons/2x/icon_animation_tree_player.png and b/editor/icons/2x/icon_animation_tree_player.png differ diff --git a/editor/icons/2x/icon_arrow_left.png b/editor/icons/2x/icon_arrow_left.png index bc3995f70bc..64bb9c81c07 100644 Binary files a/editor/icons/2x/icon_arrow_left.png and b/editor/icons/2x/icon_arrow_left.png differ diff --git a/editor/icons/2x/icon_arrow_right.png b/editor/icons/2x/icon_arrow_right.png index 045b390e0dd..c3d6e664824 100644 Binary files a/editor/icons/2x/icon_arrow_right.png and b/editor/icons/2x/icon_arrow_right.png differ diff --git a/editor/icons/2x/icon_arrow_up.png b/editor/icons/2x/icon_arrow_up.png index 524ab934e2f..008ef633baf 100644 Binary files a/editor/icons/2x/icon_arrow_up.png and b/editor/icons/2x/icon_arrow_up.png differ diff --git a/editor/icons/2x/icon_asset_lib.png b/editor/icons/2x/icon_asset_lib.png new file mode 100644 index 00000000000..22c31fb2d58 Binary files /dev/null and b/editor/icons/2x/icon_asset_lib.png differ diff --git a/editor/icons/2x/icon_audio_bus_bypass.png b/editor/icons/2x/icon_audio_bus_bypass.png new file mode 100644 index 00000000000..b44c40fb353 Binary files /dev/null and b/editor/icons/2x/icon_audio_bus_bypass.png differ diff --git a/editor/icons/2x/icon_audio_bus_layout.png b/editor/icons/2x/icon_audio_bus_layout.png new file mode 100644 index 00000000000..d6a5cba5c18 Binary files /dev/null and b/editor/icons/2x/icon_audio_bus_layout.png differ diff --git a/editor/icons/2x/icon_audio_bus_mute.png b/editor/icons/2x/icon_audio_bus_mute.png new file mode 100644 index 00000000000..4b334682f00 Binary files /dev/null and b/editor/icons/2x/icon_audio_bus_mute.png differ diff --git a/editor/icons/2x/icon_audio_bus_solo.png b/editor/icons/2x/icon_audio_bus_solo.png new file mode 100644 index 00000000000..b09a15351ad Binary files /dev/null and b/editor/icons/2x/icon_audio_bus_solo.png differ diff --git a/editor/icons/2x/icon_audio_effect_amplify.png b/editor/icons/2x/icon_audio_effect_amplify.png new file mode 100644 index 00000000000..868bc6ddded Binary files /dev/null and b/editor/icons/2x/icon_audio_effect_amplify.png differ diff --git a/editor/icons/2x/icon_audio_player.png b/editor/icons/2x/icon_audio_player.png new file mode 100644 index 00000000000..799b93cc5d0 Binary files /dev/null and b/editor/icons/2x/icon_audio_player.png differ diff --git a/editor/icons/2x/icon_back.png b/editor/icons/2x/icon_back.png index 648c4409289..b3c9b302b4d 100644 Binary files a/editor/icons/2x/icon_back.png and b/editor/icons/2x/icon_back.png differ diff --git a/editor/icons/2x/icon_baked_light.png b/editor/icons/2x/icon_baked_light.png index 3c1cba5586d..9b13ed8ff13 100644 Binary files a/editor/icons/2x/icon_baked_light.png and b/editor/icons/2x/icon_baked_light.png differ diff --git a/editor/icons/2x/icon_bool.png b/editor/icons/2x/icon_bool.png index 47103538bd8..e2383809d83 100644 Binary files a/editor/icons/2x/icon_bool.png and b/editor/icons/2x/icon_bool.png differ diff --git a/editor/icons/2x/icon_bus_vu_db.png b/editor/icons/2x/icon_bus_vu_db.png new file mode 100644 index 00000000000..8856b026f02 Binary files /dev/null and b/editor/icons/2x/icon_bus_vu_db.png differ diff --git a/editor/icons/2x/icon_bus_vu_empty.png b/editor/icons/2x/icon_bus_vu_empty.png new file mode 100644 index 00000000000..dfa1536fb43 Binary files /dev/null and b/editor/icons/2x/icon_bus_vu_empty.png differ diff --git a/editor/icons/2x/icon_bus_vu_frozen.png b/editor/icons/2x/icon_bus_vu_frozen.png new file mode 100644 index 00000000000..367322b21cc Binary files /dev/null and b/editor/icons/2x/icon_bus_vu_frozen.png differ diff --git a/editor/icons/2x/icon_bus_vu_full.png b/editor/icons/2x/icon_bus_vu_full.png new file mode 100644 index 00000000000..2c2f0bca066 Binary files /dev/null and b/editor/icons/2x/icon_bus_vu_full.png differ diff --git a/editor/icons/2x/icon_checked.png b/editor/icons/2x/icon_checked.png new file mode 100644 index 00000000000..6083540ffe2 Binary files /dev/null and b/editor/icons/2x/icon_checked.png differ diff --git a/editor/icons/2x/icon_copy_node_path.png b/editor/icons/2x/icon_copy_node_path.png index 056748d20bb..29180d017c4 100644 Binary files a/editor/icons/2x/icon_copy_node_path.png and b/editor/icons/2x/icon_copy_node_path.png differ diff --git a/editor/icons/2x/icon_curve_texture.png b/editor/icons/2x/icon_curve_texture.png new file mode 100644 index 00000000000..ccdebe89f5e Binary files /dev/null and b/editor/icons/2x/icon_curve_texture.png differ diff --git a/editor/icons/2x/icon_debug.png b/editor/icons/2x/icon_debug.png new file mode 100644 index 00000000000..9c581f340f4 Binary files /dev/null and b/editor/icons/2x/icon_debug.png differ diff --git a/editor/icons/2x/icon_dropdown.png b/editor/icons/2x/icon_dropdown.png new file mode 100644 index 00000000000..626dba79ec3 Binary files /dev/null and b/editor/icons/2x/icon_dropdown.png differ diff --git a/editor/icons/2x/icon_edit_resource.png b/editor/icons/2x/icon_edit_resource.png index 5ba9b36b0aa..f0c75701600 100644 Binary files a/editor/icons/2x/icon_edit_resource.png and b/editor/icons/2x/icon_edit_resource.png differ diff --git a/editor/icons/2x/icon_error.png b/editor/icons/2x/icon_error.png index a6d79ab41b7..c915da1d271 100644 Binary files a/editor/icons/2x/icon_error.png and b/editor/icons/2x/icon_error.png differ diff --git a/editor/icons/2x/icon_file.png b/editor/icons/2x/icon_file.png index 683f1141fd1..a10fe2cc60e 100644 Binary files a/editor/icons/2x/icon_file.png and b/editor/icons/2x/icon_file.png differ diff --git a/editor/icons/2x/icon_forward.png b/editor/icons/2x/icon_forward.png index 11fd444a048..60294493546 100644 Binary files a/editor/icons/2x/icon_forward.png and b/editor/icons/2x/icon_forward.png differ diff --git a/editor/icons/2x/icon_g_d_native_script.png b/editor/icons/2x/icon_g_d_native_script.png new file mode 100644 index 00000000000..31cc130867c Binary files /dev/null and b/editor/icons/2x/icon_g_d_native_script.png differ diff --git a/editor/icons/2x/icon_gradient_texture.png b/editor/icons/2x/icon_gradient_texture.png new file mode 100644 index 00000000000..d002c8534c9 Binary files /dev/null and b/editor/icons/2x/icon_gradient_texture.png differ diff --git a/editor/icons/2x/icon_graph_scalars_to_vec.png b/editor/icons/2x/icon_graph_scalars_to_vec.png index 266c84e5aea..7363a47db3c 100644 Binary files a/editor/icons/2x/icon_graph_scalars_to_vec.png and b/editor/icons/2x/icon_graph_scalars_to_vec.png differ diff --git a/editor/icons/2x/icon_graph_vec_to_scalars.png b/editor/icons/2x/icon_graph_vec_to_scalars.png index 1b8254b3c6e..6d16ea72fec 100644 Binary files a/editor/icons/2x/icon_graph_vec_to_scalars.png and b/editor/icons/2x/icon_graph_vec_to_scalars.png differ diff --git a/editor/icons/2x/icon_graph_vecs_to_xform.png b/editor/icons/2x/icon_graph_vecs_to_xform.png index a9ed5052be0..0f2ad7a83ad 100644 Binary files a/editor/icons/2x/icon_graph_vecs_to_xform.png and b/editor/icons/2x/icon_graph_vecs_to_xform.png differ diff --git a/editor/icons/2x/icon_graph_xform_to_vecs.png b/editor/icons/2x/icon_graph_xform_to_vecs.png index 22125df5733..d274ad99a6e 100644 Binary files a/editor/icons/2x/icon_graph_xform_to_vecs.png and b/editor/icons/2x/icon_graph_xform_to_vecs.png differ diff --git a/editor/icons/2x/icon_hslider_bg.png b/editor/icons/2x/icon_hslider_bg.png new file mode 100644 index 00000000000..e3c61f25e0d Binary files /dev/null and b/editor/icons/2x/icon_hslider_bg.png differ diff --git a/editor/icons/2x/icon_key_hover.png b/editor/icons/2x/icon_key_hover.png index c9894ad8bf2..5dd96e8dca1 100644 Binary files a/editor/icons/2x/icon_key_hover.png and b/editor/icons/2x/icon_key_hover.png differ diff --git a/editor/icons/2x/icon_key_selected.png b/editor/icons/2x/icon_key_selected.png index 243dacb604b..7fc9ffdeb42 100644 Binary files a/editor/icons/2x/icon_key_selected.png and b/editor/icons/2x/icon_key_selected.png differ diff --git a/editor/icons/2x/icon_key_value.png b/editor/icons/2x/icon_key_value.png index 38634037060..94921e24464 100644 Binary files a/editor/icons/2x/icon_key_value.png and b/editor/icons/2x/icon_key_value.png differ diff --git a/editor/icons/2x/icon_key_xform.png b/editor/icons/2x/icon_key_xform.png index 70c49b5b5fc..5749aac8f4d 100644 Binary files a/editor/icons/2x/icon_key_xform.png and b/editor/icons/2x/icon_key_xform.png differ diff --git a/editor/icons/2x/icon_line_2d.png b/editor/icons/2x/icon_line_2d.png index 27299a2b69d..66e5bbc5ba4 100644 Binary files a/editor/icons/2x/icon_line_2d.png and b/editor/icons/2x/icon_line_2d.png differ diff --git a/editor/icons/2x/icon_load.png b/editor/icons/2x/icon_load.png index 759381d636b..2e797c448b0 100644 Binary files a/editor/icons/2x/icon_load.png and b/editor/icons/2x/icon_load.png differ diff --git a/editor/icons/2x/icon_mini_basis.png b/editor/icons/2x/icon_mini_basis.png new file mode 100644 index 00000000000..276b48d7227 Binary files /dev/null and b/editor/icons/2x/icon_mini_basis.png differ diff --git a/editor/icons/2x/icon_mini_matrix3.png b/editor/icons/2x/icon_mini_matrix3.png index 93783177e1c..276b48d7227 100644 Binary files a/editor/icons/2x/icon_mini_matrix3.png and b/editor/icons/2x/icon_mini_matrix3.png differ diff --git a/editor/icons/2x/icon_mini_transform2D.png b/editor/icons/2x/icon_mini_transform2D.png new file mode 100644 index 00000000000..4237eced180 Binary files /dev/null and b/editor/icons/2x/icon_mini_transform2D.png differ diff --git a/editor/icons/2x/icon_mirror_x.png b/editor/icons/2x/icon_mirror_x.png index 3b096dce884..b5a8867a16b 100644 Binary files a/editor/icons/2x/icon_mirror_x.png and b/editor/icons/2x/icon_mirror_x.png differ diff --git a/editor/icons/2x/icon_mirror_y.png b/editor/icons/2x/icon_mirror_y.png index 4c89b167b5f..4a0483eb707 100644 Binary files a/editor/icons/2x/icon_mirror_y.png and b/editor/icons/2x/icon_mirror_y.png differ diff --git a/editor/icons/2x/icon_move_down.png b/editor/icons/2x/icon_move_down.png index 97bbeea631e..2a17aab2044 100644 Binary files a/editor/icons/2x/icon_move_down.png and b/editor/icons/2x/icon_move_down.png differ diff --git a/editor/icons/2x/icon_move_up.png b/editor/icons/2x/icon_move_up.png index f8f31baeb11..d8d7f5a2070 100644 Binary files a/editor/icons/2x/icon_move_up.png and b/editor/icons/2x/icon_move_up.png differ diff --git a/editor/icons/2x/icon_new.png b/editor/icons/2x/icon_new.png index 683f1141fd1..a10fe2cc60e 100644 Binary files a/editor/icons/2x/icon_new.png and b/editor/icons/2x/icon_new.png differ diff --git a/editor/icons/2x/icon_option_arrow.png b/editor/icons/2x/icon_option_arrow.png new file mode 100644 index 00000000000..ed177a44512 Binary files /dev/null and b/editor/icons/2x/icon_option_arrow.png differ diff --git a/editor/icons/2x/icon_particles_material.png b/editor/icons/2x/icon_particles_material.png new file mode 100644 index 00000000000..26ce8f6809b Binary files /dev/null and b/editor/icons/2x/icon_particles_material.png differ diff --git a/editor/icons/2x/icon_play_button_group.png b/editor/icons/2x/icon_play_button_group.png new file mode 100644 index 00000000000..e28cb52e644 Binary files /dev/null and b/editor/icons/2x/icon_play_button_group.png differ diff --git a/editor/icons/2x/icon_search.png b/editor/icons/2x/icon_search.png new file mode 100644 index 00000000000..0c4a6a8c84d Binary files /dev/null and b/editor/icons/2x/icon_search.png differ diff --git a/editor/icons/2x/icon_slider_grabber.png b/editor/icons/2x/icon_slider_grabber.png new file mode 100644 index 00000000000..64cf83270a3 Binary files /dev/null and b/editor/icons/2x/icon_slider_grabber.png differ diff --git a/editor/icons/2x/icon_slider_grabber_hl.png b/editor/icons/2x/icon_slider_grabber_hl.png new file mode 100644 index 00000000000..d68da0d12a9 Binary files /dev/null and b/editor/icons/2x/icon_slider_grabber_hl.png differ diff --git a/editor/icons/2x/icon_spatial_material.png b/editor/icons/2x/icon_spatial_material.png new file mode 100644 index 00000000000..68f6cf8dac8 Binary files /dev/null and b/editor/icons/2x/icon_spatial_material.png differ diff --git a/editor/icons/2x/icon_spinbox_updown.png b/editor/icons/2x/icon_spinbox_updown.png new file mode 100644 index 00000000000..e711fbf08bf Binary files /dev/null and b/editor/icons/2x/icon_spinbox_updown.png differ diff --git a/editor/icons/2x/icon_stream_texture.png b/editor/icons/2x/icon_stream_texture.png new file mode 100644 index 00000000000..85cc3e7206e Binary files /dev/null and b/editor/icons/2x/icon_stream_texture.png differ diff --git a/editor/icons/2x/icon_tab_menu.png b/editor/icons/2x/icon_tab_menu.png new file mode 100644 index 00000000000..becad9db764 Binary files /dev/null and b/editor/icons/2x/icon_tab_menu.png differ diff --git a/editor/icons/2x/icon_tabs.png b/editor/icons/2x/icon_tabs.png index 6c317010c8e..af61bc5ab15 100644 Binary files a/editor/icons/2x/icon_tabs.png and b/editor/icons/2x/icon_tabs.png differ diff --git a/editor/icons/2x/icon_tree_arrow_down.png b/editor/icons/2x/icon_tree_arrow_down.png new file mode 100644 index 00000000000..00012dea390 Binary files /dev/null and b/editor/icons/2x/icon_tree_arrow_down.png differ diff --git a/editor/icons/2x/icon_tree_arrow_right.png b/editor/icons/2x/icon_tree_arrow_right.png new file mode 100644 index 00000000000..baaf0167843 Binary files /dev/null and b/editor/icons/2x/icon_tree_arrow_right.png differ diff --git a/editor/icons/2x/icon_tween.png b/editor/icons/2x/icon_tween.png index a13d955eb02..1f020a0e797 100644 Binary files a/editor/icons/2x/icon_tween.png and b/editor/icons/2x/icon_tween.png differ diff --git a/editor/icons/2x/icon_unchecked.png b/editor/icons/2x/icon_unchecked.png new file mode 100644 index 00000000000..cd8b7810001 Binary files /dev/null and b/editor/icons/2x/icon_unchecked.png differ diff --git a/editor/icons/2x/icon_vslider_bg.png b/editor/icons/2x/icon_vslider_bg.png new file mode 100644 index 00000000000..a7e0e785648 Binary files /dev/null and b/editor/icons/2x/icon_vslider_bg.png differ diff --git a/editor/icons/2x/icon_warning.png b/editor/icons/2x/icon_warning.png index 5d807065e7c..e953c02ce36 100644 Binary files a/editor/icons/2x/icon_warning.png and b/editor/icons/2x/icon_warning.png differ diff --git a/editor/icons/2x/icon_zoom.png b/editor/icons/2x/icon_zoom.png index 0c4a6a8c84d..0de25b4db71 100644 Binary files a/editor/icons/2x/icon_zoom.png and b/editor/icons/2x/icon_zoom.png differ diff --git a/editor/icons/icon_2_d.png b/editor/icons/icon_2_d.png new file mode 100644 index 00000000000..d8a77ee1c23 Binary files /dev/null and b/editor/icons/icon_2_d.png differ diff --git a/editor/icons/icon_3_d.png b/editor/icons/icon_3_d.png new file mode 100644 index 00000000000..e1daf1077b5 Binary files /dev/null and b/editor/icons/icon_3_d.png differ diff --git a/editor/icons/icon_animation_player.png b/editor/icons/icon_animation_player.png index 8a6f446e4e4..474ec2e647f 100644 Binary files a/editor/icons/icon_animation_player.png and b/editor/icons/icon_animation_player.png differ diff --git a/editor/icons/icon_animation_tree.png b/editor/icons/icon_animation_tree.png index 684edb876ba..7a29f4d8417 100644 Binary files a/editor/icons/icon_animation_tree.png and b/editor/icons/icon_animation_tree.png differ diff --git a/editor/icons/icon_animation_tree_player.png b/editor/icons/icon_animation_tree_player.png index 684edb876ba..7a29f4d8417 100644 Binary files a/editor/icons/icon_animation_tree_player.png and b/editor/icons/icon_animation_tree_player.png differ diff --git a/editor/icons/icon_arrow_left.png b/editor/icons/icon_arrow_left.png index 1e0d38b4b67..ad382516c22 100644 Binary files a/editor/icons/icon_arrow_left.png and b/editor/icons/icon_arrow_left.png differ diff --git a/editor/icons/icon_arrow_right.png b/editor/icons/icon_arrow_right.png index 09907755e12..6260d44facf 100644 Binary files a/editor/icons/icon_arrow_right.png and b/editor/icons/icon_arrow_right.png differ diff --git a/editor/icons/icon_arrow_up.png b/editor/icons/icon_arrow_up.png index f7ec666f69a..2f02f48e18b 100644 Binary files a/editor/icons/icon_arrow_up.png and b/editor/icons/icon_arrow_up.png differ diff --git a/editor/icons/icon_asset_lib.png b/editor/icons/icon_asset_lib.png new file mode 100644 index 00000000000..70d708a58cd Binary files /dev/null and b/editor/icons/icon_asset_lib.png differ diff --git a/editor/icons/icon_audio_bus_bypass.png b/editor/icons/icon_audio_bus_bypass.png new file mode 100644 index 00000000000..95a3a0177a5 Binary files /dev/null and b/editor/icons/icon_audio_bus_bypass.png differ diff --git a/editor/icons/icon_audio_bus_layout.png b/editor/icons/icon_audio_bus_layout.png new file mode 100644 index 00000000000..bfa5e2c9336 Binary files /dev/null and b/editor/icons/icon_audio_bus_layout.png differ diff --git a/editor/icons/icon_audio_bus_mute.png b/editor/icons/icon_audio_bus_mute.png new file mode 100644 index 00000000000..b074d848e0a Binary files /dev/null and b/editor/icons/icon_audio_bus_mute.png differ diff --git a/editor/icons/icon_audio_bus_solo.png b/editor/icons/icon_audio_bus_solo.png new file mode 100644 index 00000000000..085269f2319 Binary files /dev/null and b/editor/icons/icon_audio_bus_solo.png differ diff --git a/editor/icons/icon_audio_effect_amplify.png b/editor/icons/icon_audio_effect_amplify.png index 9af3227d408..6588b90372e 100644 Binary files a/editor/icons/icon_audio_effect_amplify.png and b/editor/icons/icon_audio_effect_amplify.png differ diff --git a/editor/icons/icon_audio_player.png b/editor/icons/icon_audio_player.png new file mode 100644 index 00000000000..c3e6d6cafad Binary files /dev/null and b/editor/icons/icon_audio_player.png differ diff --git a/editor/icons/icon_back.png b/editor/icons/icon_back.png index 52fbc8117a6..8497d2cf4b8 100644 Binary files a/editor/icons/icon_back.png and b/editor/icons/icon_back.png differ diff --git a/editor/icons/icon_baked_light.png b/editor/icons/icon_baked_light.png index 3b7fce5c9f9..c667b542c12 100644 Binary files a/editor/icons/icon_baked_light.png and b/editor/icons/icon_baked_light.png differ diff --git a/editor/icons/icon_bool.png b/editor/icons/icon_bool.png index 822b5dd688b..c680bc195a8 100644 Binary files a/editor/icons/icon_bool.png and b/editor/icons/icon_bool.png differ diff --git a/editor/icons/icon_bus_vu_db.png b/editor/icons/icon_bus_vu_db.png index 52507cae529..2c51a2e5592 100644 Binary files a/editor/icons/icon_bus_vu_db.png and b/editor/icons/icon_bus_vu_db.png differ diff --git a/editor/icons/icon_bus_vu_empty.png b/editor/icons/icon_bus_vu_empty.png index 6fc3143a551..32d886b1a2f 100644 Binary files a/editor/icons/icon_bus_vu_empty.png and b/editor/icons/icon_bus_vu_empty.png differ diff --git a/editor/icons/icon_bus_vu_frozen.png b/editor/icons/icon_bus_vu_frozen.png index cf128afa91c..1a6ca6e7671 100644 Binary files a/editor/icons/icon_bus_vu_frozen.png and b/editor/icons/icon_bus_vu_frozen.png differ diff --git a/editor/icons/icon_bus_vu_full.png b/editor/icons/icon_bus_vu_full.png index 9e3d7a93e34..b47deea254a 100644 Binary files a/editor/icons/icon_bus_vu_full.png and b/editor/icons/icon_bus_vu_full.png differ diff --git a/editor/icons/icon_checked.png b/editor/icons/icon_checked.png new file mode 100644 index 00000000000..d3442930bb9 Binary files /dev/null and b/editor/icons/icon_checked.png differ diff --git a/editor/icons/icon_copy_node_path.png b/editor/icons/icon_copy_node_path.png index d777f132d87..877bb81d814 100644 Binary files a/editor/icons/icon_copy_node_path.png and b/editor/icons/icon_copy_node_path.png differ diff --git a/editor/icons/icon_curve_texture.png b/editor/icons/icon_curve_texture.png new file mode 100644 index 00000000000..bc5c7f6bf16 Binary files /dev/null and b/editor/icons/icon_curve_texture.png differ diff --git a/editor/icons/icon_debug.png b/editor/icons/icon_debug.png index 03b98aa9e4c..a4a4591e120 100644 Binary files a/editor/icons/icon_debug.png and b/editor/icons/icon_debug.png differ diff --git a/editor/icons/icon_dropdown.png b/editor/icons/icon_dropdown.png new file mode 100644 index 00000000000..b9a324be7c2 Binary files /dev/null and b/editor/icons/icon_dropdown.png differ diff --git a/editor/icons/icon_edit_resource.png b/editor/icons/icon_edit_resource.png index 9f064fea3f4..fca57f3e7e7 100644 Binary files a/editor/icons/icon_edit_resource.png and b/editor/icons/icon_edit_resource.png differ diff --git a/editor/icons/icon_error.png b/editor/icons/icon_error.png index 7a9bed43aa2..8a9130f70be 100644 Binary files a/editor/icons/icon_error.png and b/editor/icons/icon_error.png differ diff --git a/editor/icons/icon_file.png b/editor/icons/icon_file.png index 69c6c90dc70..b012e1f2145 100644 Binary files a/editor/icons/icon_file.png and b/editor/icons/icon_file.png differ diff --git a/editor/icons/icon_forward.png b/editor/icons/icon_forward.png index 412ffa89d3c..529964f49da 100644 Binary files a/editor/icons/icon_forward.png and b/editor/icons/icon_forward.png differ diff --git a/editor/icons/icon_g_d_native_script.png b/editor/icons/icon_g_d_native_script.png new file mode 100644 index 00000000000..ea4fe067044 Binary files /dev/null and b/editor/icons/icon_g_d_native_script.png differ diff --git a/editor/icons/icon_gradient_texture.png b/editor/icons/icon_gradient_texture.png new file mode 100644 index 00000000000..fedbf038a30 Binary files /dev/null and b/editor/icons/icon_gradient_texture.png differ diff --git a/editor/icons/icon_graph_scalars_to_vec.png b/editor/icons/icon_graph_scalars_to_vec.png index 231a25a02a3..b8893e78cad 100644 Binary files a/editor/icons/icon_graph_scalars_to_vec.png and b/editor/icons/icon_graph_scalars_to_vec.png differ diff --git a/editor/icons/icon_graph_vec_to_scalars.png b/editor/icons/icon_graph_vec_to_scalars.png index 33f9fdf9bd2..b0f2a9c4aec 100644 Binary files a/editor/icons/icon_graph_vec_to_scalars.png and b/editor/icons/icon_graph_vec_to_scalars.png differ diff --git a/editor/icons/icon_graph_vecs_to_xform.png b/editor/icons/icon_graph_vecs_to_xform.png index 82c32525dc9..b5217badcfc 100644 Binary files a/editor/icons/icon_graph_vecs_to_xform.png and b/editor/icons/icon_graph_vecs_to_xform.png differ diff --git a/editor/icons/icon_graph_xform_to_vecs.png b/editor/icons/icon_graph_xform_to_vecs.png index 3d59c7957de..9e2909969f4 100644 Binary files a/editor/icons/icon_graph_xform_to_vecs.png and b/editor/icons/icon_graph_xform_to_vecs.png differ diff --git a/editor/icons/icon_hslider_bg.png b/editor/icons/icon_hslider_bg.png new file mode 100644 index 00000000000..e3c61f25e0d Binary files /dev/null and b/editor/icons/icon_hslider_bg.png differ diff --git a/editor/icons/icon_hsplit_bg.png b/editor/icons/icon_hsplit_bg.png new file mode 100644 index 00000000000..cfb76f7dc72 Binary files /dev/null and b/editor/icons/icon_hsplit_bg.png differ diff --git a/editor/icons/icon_hsplitter.png b/editor/icons/icon_hsplitter.png new file mode 100644 index 00000000000..3ac1dddf904 Binary files /dev/null and b/editor/icons/icon_hsplitter.png differ diff --git a/editor/icons/icon_key_hover.png b/editor/icons/icon_key_hover.png index 7ab405bb075..c8e59f0e87d 100644 Binary files a/editor/icons/icon_key_hover.png and b/editor/icons/icon_key_hover.png differ diff --git a/editor/icons/icon_key_selected.png b/editor/icons/icon_key_selected.png index 1838dc95aa6..e5f802db1cb 100644 Binary files a/editor/icons/icon_key_selected.png and b/editor/icons/icon_key_selected.png differ diff --git a/editor/icons/icon_key_value.png b/editor/icons/icon_key_value.png index 5c0b25a264c..1fa007f9e2e 100644 Binary files a/editor/icons/icon_key_value.png and b/editor/icons/icon_key_value.png differ diff --git a/editor/icons/icon_key_xform.png b/editor/icons/icon_key_xform.png index 1171bd80db5..bd87611d7a8 100644 Binary files a/editor/icons/icon_key_xform.png and b/editor/icons/icon_key_xform.png differ diff --git a/editor/icons/icon_line_2d.png b/editor/icons/icon_line_2d.png index 4ebf46af04e..8d2b176335c 100644 Binary files a/editor/icons/icon_line_2d.png and b/editor/icons/icon_line_2d.png differ diff --git a/editor/icons/icon_load.png b/editor/icons/icon_load.png index 81835efa25f..cc05e98ebb3 100644 Binary files a/editor/icons/icon_load.png and b/editor/icons/icon_load.png differ diff --git a/editor/icons/icon_mini_basis.png b/editor/icons/icon_mini_basis.png new file mode 100644 index 00000000000..7a4ac9b1376 Binary files /dev/null and b/editor/icons/icon_mini_basis.png differ diff --git a/editor/icons/icon_mini_matrix3.png b/editor/icons/icon_mini_matrix3.png index dd59d093cc9..7a4ac9b1376 100644 Binary files a/editor/icons/icon_mini_matrix3.png and b/editor/icons/icon_mini_matrix3.png differ diff --git a/editor/icons/icon_mini_transform2D.png b/editor/icons/icon_mini_transform2D.png new file mode 100644 index 00000000000..f4e1211bd7b Binary files /dev/null and b/editor/icons/icon_mini_transform2D.png differ diff --git a/editor/icons/icon_mirror_x.png b/editor/icons/icon_mirror_x.png index 7be48946b4c..f2c9074b893 100644 Binary files a/editor/icons/icon_mirror_x.png and b/editor/icons/icon_mirror_x.png differ diff --git a/editor/icons/icon_mirror_y.png b/editor/icons/icon_mirror_y.png index ba924f7ae77..655f52d4812 100644 Binary files a/editor/icons/icon_mirror_y.png and b/editor/icons/icon_mirror_y.png differ diff --git a/editor/icons/icon_move_down.png b/editor/icons/icon_move_down.png index 39343109646..7bb964675d0 100644 Binary files a/editor/icons/icon_move_down.png and b/editor/icons/icon_move_down.png differ diff --git a/editor/icons/icon_move_up.png b/editor/icons/icon_move_up.png index 684013dc404..92614b8799c 100644 Binary files a/editor/icons/icon_move_up.png and b/editor/icons/icon_move_up.png differ diff --git a/editor/icons/icon_new.png b/editor/icons/icon_new.png index 69c6c90dc70..b012e1f2145 100644 Binary files a/editor/icons/icon_new.png and b/editor/icons/icon_new.png differ diff --git a/editor/icons/icon_option_arrow.png b/editor/icons/icon_option_arrow.png new file mode 100644 index 00000000000..b7bc38e03f3 Binary files /dev/null and b/editor/icons/icon_option_arrow.png differ diff --git a/editor/icons/icon_particles_material.png b/editor/icons/icon_particles_material.png new file mode 100644 index 00000000000..3b5c5644b2b Binary files /dev/null and b/editor/icons/icon_particles_material.png differ diff --git a/editor/icons/icon_play_button_group.png b/editor/icons/icon_play_button_group.png new file mode 100644 index 00000000000..83820c8e0c2 Binary files /dev/null and b/editor/icons/icon_play_button_group.png differ diff --git a/editor/icons/icon_scroll_bg.png b/editor/icons/icon_scroll_bg.png new file mode 100644 index 00000000000..1908fd8aee1 Binary files /dev/null and b/editor/icons/icon_scroll_bg.png differ diff --git a/editor/icons/icon_scroll_grabber.png b/editor/icons/icon_scroll_grabber.png new file mode 100644 index 00000000000..4be7f4e6ccc Binary files /dev/null and b/editor/icons/icon_scroll_grabber.png differ diff --git a/editor/icons/icon_scroll_grabber_hl.png b/editor/icons/icon_scroll_grabber_hl.png new file mode 100644 index 00000000000..a81239b84be Binary files /dev/null and b/editor/icons/icon_scroll_grabber_hl.png differ diff --git a/editor/icons/icon_search.png b/editor/icons/icon_search.png new file mode 100644 index 00000000000..f3748803cfe Binary files /dev/null and b/editor/icons/icon_search.png differ diff --git a/editor/icons/icon_slider_grabber.png b/editor/icons/icon_slider_grabber.png new file mode 100644 index 00000000000..6b6982e26c9 Binary files /dev/null and b/editor/icons/icon_slider_grabber.png differ diff --git a/editor/icons/icon_slider_grabber_hl.png b/editor/icons/icon_slider_grabber_hl.png new file mode 100644 index 00000000000..03d4b2bb998 Binary files /dev/null and b/editor/icons/icon_slider_grabber_hl.png differ diff --git a/editor/icons/icon_spatial_material.png b/editor/icons/icon_spatial_material.png new file mode 100644 index 00000000000..7608fc9036e Binary files /dev/null and b/editor/icons/icon_spatial_material.png differ diff --git a/editor/icons/icon_spinbox_updown.png b/editor/icons/icon_spinbox_updown.png new file mode 100644 index 00000000000..ff65df801bf Binary files /dev/null and b/editor/icons/icon_spinbox_updown.png differ diff --git a/editor/icons/icon_stream_texture.png b/editor/icons/icon_stream_texture.png new file mode 100644 index 00000000000..1858a299d7b Binary files /dev/null and b/editor/icons/icon_stream_texture.png differ diff --git a/editor/icons/icon_tab_menu.png b/editor/icons/icon_tab_menu.png index 29edd02f016..ffc63f2d415 100644 Binary files a/editor/icons/icon_tab_menu.png and b/editor/icons/icon_tab_menu.png differ diff --git a/editor/icons/icon_tabs.png b/editor/icons/icon_tabs.png index bef0f606603..c17ab6fa1bb 100644 Binary files a/editor/icons/icon_tabs.png and b/editor/icons/icon_tabs.png differ diff --git a/editor/icons/icon_tree_arrow_down.png b/editor/icons/icon_tree_arrow_down.png new file mode 100644 index 00000000000..4ef7b41de64 Binary files /dev/null and b/editor/icons/icon_tree_arrow_down.png differ diff --git a/editor/icons/icon_tree_arrow_right.png b/editor/icons/icon_tree_arrow_right.png new file mode 100644 index 00000000000..13a42f730d5 Binary files /dev/null and b/editor/icons/icon_tree_arrow_right.png differ diff --git a/editor/icons/icon_tween.png b/editor/icons/icon_tween.png index 36717c09229..3181e2cf63c 100644 Binary files a/editor/icons/icon_tween.png and b/editor/icons/icon_tween.png differ diff --git a/editor/icons/icon_unchecked.png b/editor/icons/icon_unchecked.png new file mode 100644 index 00000000000..9d7d55aa460 Binary files /dev/null and b/editor/icons/icon_unchecked.png differ diff --git a/editor/icons/icon_vslider_bg.png b/editor/icons/icon_vslider_bg.png new file mode 100644 index 00000000000..a7e0e785648 Binary files /dev/null and b/editor/icons/icon_vslider_bg.png differ diff --git a/editor/icons/icon_vsplit_bg.png b/editor/icons/icon_vsplit_bg.png new file mode 100644 index 00000000000..0c29b1e35c9 Binary files /dev/null and b/editor/icons/icon_vsplit_bg.png differ diff --git a/editor/icons/icon_vsplitter.png b/editor/icons/icon_vsplitter.png new file mode 100644 index 00000000000..56fb20bc3ff Binary files /dev/null and b/editor/icons/icon_vsplitter.png differ diff --git a/editor/icons/icon_warning.png b/editor/icons/icon_warning.png index 451beba8207..45b52542da1 100644 Binary files a/editor/icons/icon_warning.png and b/editor/icons/icon_warning.png differ diff --git a/editor/icons/icon_zoom.png b/editor/icons/icon_zoom.png index f3748803cfe..e95cf2bd788 100644 Binary files a/editor/icons/icon_zoom.png and b/editor/icons/icon_zoom.png differ diff --git a/editor/icons/source/icon_animation_player.svg b/editor/icons/source/icon_animation_player.svg index add4d5ac42e..e6500ea249c 100644 --- a/editor/icons/source/icon_animation_player.svg +++ b/editor/icons/source/icon_animation_player.svg @@ -14,11 +14,11 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_animation_player.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" - sodipodi:docname="icon_animation_player (copy).svg"> + sodipodi:docname="icon_animation_player.svg"> @@ -59,7 +59,7 @@ image/svg+xml - + @@ -69,7 +69,7 @@ id="layer1" transform="translate(0,-1036.3622)"> + sodipodi:docname="icon_animation_tree_player.svg"> @@ -59,7 +59,7 @@ image/svg+xml - + @@ -69,8 +69,8 @@ id="layer1" transform="translate(0,-1036.3622)"> diff --git a/editor/icons/source/icon_arrow_left.svg b/editor/icons/source/icon_arrow_left.svg index 75a9ef0d68e..a9be19b6d41 100644 --- a/editor/icons/source/icon_arrow_left.svg +++ b/editor/icons/source/icon_arrow_left.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_arrow_left.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="32" - inkscape:cx="-0.2534386" - inkscape:cy="9.1352698" + inkscape:cx="7.4636822" + inkscape:cy="9.1396144" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1"> @@ -69,9 +69,16 @@ id="layer1" transform="translate(0,-1036.3622)"> + style="fill:none;stroke:#e0e0e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843" + d="m 8,1048.3622 -4,-4 4,-4" + id="path814" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccc" /> + diff --git a/editor/icons/source/icon_arrow_right.svg b/editor/icons/source/icon_arrow_right.svg index a7600699f7a..f6cbe3bc198 100644 --- a/editor/icons/source/icon_arrow_right.svg +++ b/editor/icons/source/icon_arrow_right.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_arrow_left.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="32" - inkscape:cx="0.9028114" - inkscape:cy="9.2602698" + inkscape:cx="7.0981428" + inkscape:cy="9.8315212" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1"> @@ -59,7 +59,7 @@ image/svg+xml - + @@ -69,10 +69,16 @@ id="layer1" transform="translate(0,-1036.3622)"> + sodipodi:nodetypes="ccc" /> + diff --git a/editor/icons/source/icon_arrow_up.svg b/editor/icons/source/icon_arrow_up.svg index c1839cd69e7..b24a167b8ea 100644 --- a/editor/icons/source/icon_arrow_up.svg +++ b/editor/icons/source/icon_arrow_up.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_arrow_left.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="32" - inkscape:cx="6.7465614" - inkscape:cy="9.3227698" + inkscape:cx="7.0981428" + inkscape:cy="9.8315212" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1"> @@ -69,9 +69,9 @@ id="layer1" transform="translate(0,-1036.3622)"> diff --git a/editor/icons/source/icon_asset_lib.svg b/editor/icons/source/icon_asset_lib.svg new file mode 100644 index 00000000000..db9fcda6d4f --- /dev/null +++ b/editor/icons/source/icon_asset_lib.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_audio_bus_bypass.svg b/editor/icons/source/icon_audio_bus_bypass.svg new file mode 100644 index 00000000000..fe517d9ff78 --- /dev/null +++ b/editor/icons/source/icon_audio_bus_bypass.svg @@ -0,0 +1,295 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_audio_bus_layout.svg b/editor/icons/source/icon_audio_bus_layout.svg new file mode 100644 index 00000000000..66dc37ecfc5 --- /dev/null +++ b/editor/icons/source/icon_audio_bus_layout.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_audio_bus_mute.svg b/editor/icons/source/icon_audio_bus_mute.svg new file mode 100644 index 00000000000..55a776dd97d --- /dev/null +++ b/editor/icons/source/icon_audio_bus_mute.svg @@ -0,0 +1,301 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/editor/icons/source/icon_audio_bus_solo.svg b/editor/icons/source/icon_audio_bus_solo.svg new file mode 100644 index 00000000000..fd06442da1b --- /dev/null +++ b/editor/icons/source/icon_audio_bus_solo.svg @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/editor/icons/source/icon_audio_effect_amplify.svg b/editor/icons/source/icon_audio_effect_amplify.svg new file mode 100644 index 00000000000..3c75d717912 --- /dev/null +++ b/editor/icons/source/icon_audio_effect_amplify.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_audio_player.svg b/editor/icons/source/icon_audio_player.svg new file mode 100644 index 00000000000..2d9c5f4e6cc --- /dev/null +++ b/editor/icons/source/icon_audio_player.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/editor/icons/source/icon_back.svg b/editor/icons/source/icon_back.svg index 597a1c3068b..dfaf25de01a 100644 --- a/editor/icons/source/icon_back.svg +++ b/editor/icons/source/icon_back.svg @@ -14,7 +14,7 @@ viewBox="0 0 8 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_bone.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="32" - inkscape:cx="4.4850647" - inkscape:cy="8.9717887" + inkscape:cx="8.1867174" + inkscape:cy="8.4650528" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -60,7 +60,7 @@ image/svg+xml - + @@ -70,10 +70,9 @@ id="layer1" transform="translate(0,-1036.3622)"> + style="fill:none;stroke:#e0e0e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" + d="m 6,1038.3622 -4,6 4,6" + id="path814" + inkscape:connector-curvature="0" /> diff --git a/editor/icons/source/icon_baked_light.svg b/editor/icons/source/icon_baked_light.svg index 98dc3135f6b..e4d435254d2 100644 --- a/editor/icons/source/icon_baked_light.svg +++ b/editor/icons/source/icon_baked_light.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_bone.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -29,7 +29,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="22.627417" - inkscape:cx="6.1801151" + inkscape:cx="-2.7913022" inkscape:cy="10.551189" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -70,7 +70,7 @@ id="layer1" transform="translate(0,-1036.3622)"> diff --git a/editor/icons/source/icon_bool.svg b/editor/icons/source/icon_bool.svg index e471871adf6..9f429376fdd 100644 --- a/editor/icons/source/icon_bool.svg +++ b/editor/icons/source/icon_bool.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_bool.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -28,9 +28,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="-0.0405559" - inkscape:cy="11.453214" + inkscape:zoom="32" + inkscape:cx="3.5294581" + inkscape:cy="7.990409" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1"> @@ -68,10 +68,68 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)"> - + + + + + + + + + + + diff --git a/editor/icons/source/icon_bus_vu_db.svg b/editor/icons/source/icon_bus_vu_db.svg new file mode 100644 index 00000000000..813990bb423 --- /dev/null +++ b/editor/icons/source/icon_bus_vu_db.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_bus_vu_empty.svg b/editor/icons/source/icon_bus_vu_empty.svg new file mode 100644 index 00000000000..0755a2695b5 --- /dev/null +++ b/editor/icons/source/icon_bus_vu_empty.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/editor/icons/source/icon_bus_vu_frozen.svg b/editor/icons/source/icon_bus_vu_frozen.svg new file mode 100644 index 00000000000..0324076402c --- /dev/null +++ b/editor/icons/source/icon_bus_vu_frozen.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_bus_vu_full.svg b/editor/icons/source/icon_bus_vu_full.svg new file mode 100644 index 00000000000..7f2fd22560f --- /dev/null +++ b/editor/icons/source/icon_bus_vu_full.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_checked.svg b/editor/icons/source/icon_checked.svg new file mode 100644 index 00000000000..6d2c03f4c5c --- /dev/null +++ b/editor/icons/source/icon_checked.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_copy_node_path.svg b/editor/icons/source/icon_copy_node_path.svg index 9f33c5e54db..abc93eb0039 100644 --- a/editor/icons/source/icon_copy_node_path.svg +++ b/editor/icons/source/icon_copy_node_path.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/godotengine/godot/tools/editor/icons/con_script_create.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -39,8 +39,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="21.189633" - inkscape:cx="12.640765" - inkscape:cy="9.6848443" + inkscape:cx="-1.3283302" + inkscape:cy="8.1746718" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -52,8 +52,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -73,7 +73,7 @@ image/svg+xml - + @@ -90,7 +90,7 @@ ry="1.0000174" rx="1" /> diff --git a/editor/icons/source/icon_curve_texture.svg b/editor/icons/source/icon_curve_texture.svg new file mode 100644 index 00000000000..b1cb4566082 --- /dev/null +++ b/editor/icons/source/icon_curve_texture.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_debug.svg b/editor/icons/source/icon_debug.svg new file mode 100644 index 00000000000..1b3e7486683 --- /dev/null +++ b/editor/icons/source/icon_debug.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/editor/icons/source/icon_dropdown.svg b/editor/icons/source/icon_dropdown.svg new file mode 100644 index 00000000000..5963e74007c --- /dev/null +++ b/editor/icons/source/icon_dropdown.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_edit_resource.svg b/editor/icons/source/icon_edit_resource.svg index 1950988ca29..7f6516eb58b 100644 --- a/editor/icons/source/icon_edit_resource.svg +++ b/editor/icons/source/icon_edit_resource.svg @@ -14,7 +14,7 @@ viewBox="0 0 8 8" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_node.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="63.999997" - inkscape:cx="1.8775976" - inkscape:cy="5.2018914" + inkscape:cx="2.7141614" + inkscape:cy="4.341677" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -73,9 +73,9 @@ id="layer1" transform="translate(0,-1044.3622)"> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e0e0e0;fill-opacity:0.78431373;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="M 3.9902344 -0.009765625 A 1.0001 1.0001 0 0 0 3.2929688 1.7070312 L 4.5859375 3 L 1 3 L 1 5 L 4.5859375 5 L 3.2929688 6.2929688 A 1.0001 1.0001 0 1 0 4.7070312 7.7070312 L 7.7070312 4.7070312 A 1.0001 1.0001 0 0 0 7.7070312 3.2929688 L 4.7070312 0.29296875 A 1.0001 1.0001 0 0 0 3.9902344 -0.009765625 z " + transform="translate(0,1044.3622)" + id="path814" /> diff --git a/editor/icons/source/icon_error.svg b/editor/icons/source/icon_error.svg index a0b04a98cb1..013f1c7ba9b 100644 --- a/editor/icons/source/icon_error.svg +++ b/editor/icons/source/icon_error.svg @@ -14,7 +14,7 @@ viewBox="0 0 8 8" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_node.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -28,9 +28,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="22.627416" - inkscape:cx="5.542036" - inkscape:cy="14.568715" + inkscape:zoom="45.254832" + inkscape:cx="0.9455546" + inkscape:cy="4.9546755" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1"> @@ -76,6 +76,6 @@ height="8" x="2.220446e-16" y="1044.3622" - ry="1.0000174" /> + ry="4" /> diff --git a/editor/icons/source/icon_forward.svg b/editor/icons/source/icon_forward.svg index f6cb351cc13..392e2bda8ee 100644 --- a/editor/icons/source/icon_forward.svg +++ b/editor/icons/source/icon_forward.svg @@ -14,7 +14,7 @@ viewBox="0 0 8 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_bone.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -29,7 +29,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="32" - inkscape:cx="4.4850647" + inkscape:cx="-1.8586853" inkscape:cy="8.9717887" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -60,7 +60,7 @@ image/svg+xml - + @@ -70,10 +70,9 @@ id="layer1" transform="translate(0,-1036.3622)"> + style="fill:none;stroke:#e0e0e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 2,1038.3622 4,6 -4,6" + id="path814" + inkscape:connector-curvature="0" /> diff --git a/editor/icons/source/icon_g_d_native_script.svg b/editor/icons/source/icon_g_d_native_script.svg new file mode 100644 index 00000000000..33a8e52a5d0 --- /dev/null +++ b/editor/icons/source/icon_g_d_native_script.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_gradient_texture.svg b/editor/icons/source/icon_gradient_texture.svg new file mode 100644 index 00000000000..efc48bb778c --- /dev/null +++ b/editor/icons/source/icon_gradient_texture.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/editor/icons/source/icon_graph_scalars_to_vec.svg b/editor/icons/source/icon_graph_scalars_to_vec.svg index 0f2994a6068..d951a418320 100644 --- a/editor/icons/source/icon_graph_scalars_to_vec.svg +++ b/editor/icons/source/icon_graph_scalars_to_vec.svg @@ -7,6 +7,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="14" @@ -14,13 +15,35 @@ viewBox="0 0 14 14" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot-design/assets/icons/svg/icon_graph_scalar_uniform.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" sodipodi:docname="icon_graph_scalars_to_vec.svg"> + id="defs4"> + + + + + + image/svg+xml - + @@ -73,22 +96,9 @@ id="layer1" transform="translate(0,-1038.3622)"> - - + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient836);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="M 1.9902344 0.99023438 A 1.0001 1.0001 0 0 0 1.2929688 2.7070312 L 4.5859375 6 L 2 6 A 1.0001 1.0001 0 1 0 2 8 L 4.5859375 8 L 1.2929688 11.292969 A 1.0001 1.0001 0 1 0 2.7070312 12.707031 L 7.4140625 8 L 12 8 A 1.0001 1.0001 0 1 0 12 6 L 7.4140625 6 L 2.7070312 1.2929688 A 1.0001 1.0001 0 0 0 1.9902344 0.99023438 z " + transform="translate(0,1038.3622)" + id="path4154" /> diff --git a/editor/icons/source/icon_graph_vec_to_scalars.svg b/editor/icons/source/icon_graph_vec_to_scalars.svg index fb58db9d780..8bddf89b2dd 100644 --- a/editor/icons/source/icon_graph_vec_to_scalars.svg +++ b/editor/icons/source/icon_graph_vec_to_scalars.svg @@ -7,6 +7,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="14" @@ -14,13 +15,36 @@ viewBox="0 0 14 14" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot-design/assets/icons/svg/icon_graph_scalar_uniform.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" sodipodi:docname="icon_graph_vec_to_scalars.svg"> + id="defs4"> + + + + + + - - + inkscape:connector-curvature="0" /> diff --git a/editor/icons/source/icon_graph_vecs_to_xform.svg b/editor/icons/source/icon_graph_vecs_to_xform.svg index f8ba3eb4b86..13217661171 100644 --- a/editor/icons/source/icon_graph_vecs_to_xform.svg +++ b/editor/icons/source/icon_graph_vecs_to_xform.svg @@ -7,6 +7,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="14" @@ -14,13 +15,36 @@ viewBox="0 0 14 14" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot-design/assets/icons/svg/icon_graph_scalar_uniform.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" sodipodi:docname="icon_graph_vecs_to_xform.svg"> + id="defs4"> + + + + + + - diff --git a/editor/icons/source/icon_graph_xform_to_vecs.svg b/editor/icons/source/icon_graph_xform_to_vecs.svg index cc113e72fdd..45754c8a44b 100644 --- a/editor/icons/source/icon_graph_xform_to_vecs.svg +++ b/editor/icons/source/icon_graph_xform_to_vecs.svg @@ -7,6 +7,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="14" @@ -14,13 +15,36 @@ viewBox="0 0 14 14" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot-design/assets/icons/svg/icon_graph_scalar_uniform.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" sodipodi:docname="icon_graph_xform_to_vecs.svg"> + id="defs4"> + + + + + + - diff --git a/editor/icons/source/icon_hslider_bg.svg b/editor/icons/source/icon_hslider_bg.svg new file mode 100644 index 00000000000..10bea12ab82 --- /dev/null +++ b/editor/icons/source/icon_hslider_bg.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_hsplitter.svg b/editor/icons/source/icon_hsplitter.svg new file mode 100644 index 00000000000..01c893fc560 --- /dev/null +++ b/editor/icons/source/icon_hsplitter.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_key_hover.svg b/editor/icons/source/icon_key_hover.svg index c3f34a781b0..10caa819682 100644 --- a/editor/icons/source/icon_key_hover.svg +++ b/editor/icons/source/icon_key_hover.svg @@ -14,7 +14,7 @@ viewBox="0 0 8 8" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_dependency_changed_hl.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45" @@ -28,9 +28,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="43.417341" - inkscape:cx="0.40602789" - inkscape:cy="4.9542089" + inkscape:zoom="61.401392" + inkscape:cx="1.5457638" + inkscape:cy="2.7778126" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="false" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1"> @@ -59,7 +59,7 @@ image/svg+xml - + @@ -68,10 +68,14 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1044.3622)"> - + diff --git a/editor/icons/source/icon_key_selected.svg b/editor/icons/source/icon_key_selected.svg index c3f01dbec80..62180cca5be 100644 --- a/editor/icons/source/icon_key_selected.svg +++ b/editor/icons/source/icon_key_selected.svg @@ -14,7 +14,7 @@ viewBox="0 0 8 8" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_dependency_changed_hl.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45" @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="43.417341" - inkscape:cx="3.4232555" - inkscape:cy="4.5626603" + inkscape:cx="-0.88377936" + inkscape:cy="3.8025953" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="false" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1"> @@ -59,7 +59,7 @@ image/svg+xml - + @@ -68,10 +68,14 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1044.3622)"> - + diff --git a/editor/icons/source/icon_key_value.svg b/editor/icons/source/icon_key_value.svg index 5e6333e54bc..21780cc695f 100644 --- a/editor/icons/source/icon_key_value.svg +++ b/editor/icons/source/icon_key_value.svg @@ -14,7 +14,7 @@ viewBox="0 0 8 8" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_dependency_changed_hl.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45" @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="43.417341" - inkscape:cx="3.2850619" - inkscape:cy="5.046338" + inkscape:cx="3.6075137" + inkscape:cy="3.8486599" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="false" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1"> @@ -59,7 +59,7 @@ image/svg+xml - + @@ -68,10 +68,14 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1044.3622)"> - + diff --git a/editor/icons/source/icon_key_xform.svg b/editor/icons/source/icon_key_xform.svg index 06a282f7059..37de1072841 100644 --- a/editor/icons/source/icon_key_xform.svg +++ b/editor/icons/source/icon_key_xform.svg @@ -14,7 +14,7 @@ viewBox="0 0 8 8" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_dependency_changed_hl.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45" @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="43.417341" - inkscape:cx="3.2850619" - inkscape:cy="5.046338" + inkscape:cx="4.6209337" + inkscape:cy="3.8256276" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="false" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1"> @@ -59,7 +59,7 @@ image/svg+xml - + @@ -68,10 +68,14 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1044.3622)"> - + diff --git a/editor/icons/source/icon_mini_basis.svg b/editor/icons/source/icon_mini_basis.svg new file mode 100644 index 00000000000..a9d3be82ea1 --- /dev/null +++ b/editor/icons/source/icon_mini_basis.svg @@ -0,0 +1,204 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/editor/icons/source/icon_mini_matrix3.svg b/editor/icons/source/icon_mini_matrix3.svg index 592230d13c1..27adb40b17b 100644 --- a/editor/icons/source/icon_mini_matrix3.svg +++ b/editor/icons/source/icon_mini_matrix3.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 12" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_add_track.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45" @@ -28,9 +28,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="32.000001" - inkscape:cx="4.071303" - inkscape:cy="4.582959" + inkscape:zoom="22.627418" + inkscape:cx="13.930099" + inkscape:cy="4.8789967" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="false" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -70,71 +70,135 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1040.3622)"> - - - + height="5.9999666" + x="-2" + y="1044.3621" + transform="scale(-1,1)" /> - - - - - + + + + + + + + + + + + + diff --git a/editor/icons/source/icon_mini_transform2D.svg b/editor/icons/source/icon_mini_transform2D.svg new file mode 100644 index 00000000000..e8e38f12563 --- /dev/null +++ b/editor/icons/source/icon_mini_transform2D.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/editor/icons/source/icon_mirror_x.svg b/editor/icons/source/icon_mirror_x.svg index f24a6307701..ca28fec4f84 100644 --- a/editor/icons/source/icon_mirror_x.svg +++ b/editor/icons/source/icon_mirror_x.svg @@ -14,11 +14,11 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_tool_move.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" - sodipodi:docname="icon_h_size.svg"> + sodipodi:docname="icon_mirror_x.svg"> @@ -59,7 +59,7 @@ image/svg+xml - + @@ -69,11 +69,21 @@ id="layer1" transform="translate(0,-1036.3622)"> + sodipodi:nodetypes="ccc" /> + + diff --git a/editor/icons/source/icon_mirror_y.svg b/editor/icons/source/icon_mirror_y.svg index bb913b84af9..922caf6efc5 100644 --- a/editor/icons/source/icon_mirror_y.svg +++ b/editor/icons/source/icon_mirror_y.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_tool_move.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="32" - inkscape:cx="1.7618301" - inkscape:cy="7.9093121" + inkscape:cx="2.7305801" + inkscape:cy="8.1905621" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="false" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1"> @@ -59,7 +59,7 @@ image/svg+xml - + @@ -69,10 +69,9 @@ id="layer1" transform="translate(0,-1036.3622)"> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e0e0e0;fill-opacity:0.99607843;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 11.012128,1048.3548 a 1.0001,1.0001 0 0 0 -1.7167967,-0.6973 l -0.2929688,0.293 v -7.1719 l 0.2929688,0.293 a 1.0001,1.0001 0 0 0 1.7148437,-0.7266 1.0001,1.0001 0 0 0 -0.300781,-0.6875 l -2.0000003,-2 a 1.0001,1.0001 0 0 0 -1.4140624,0 l -1.9999998,2 a 1.0001,1.0001 0 1 0 1.4140622,1.4141 l 0.2929688,-0.293 v 7.1719 l -0.2929688,-0.293 a 1.0001,1.0001 0 1 0 -1.4140622,1.4141 l 1.9999998,2 a 1.0001,1.0001 0 0 0 1.4140624,0 l 2.0000003,-2 a 1.0001,1.0001 0 0 0 0.302734,-0.7168 z" + id="path816" + inkscape:connector-curvature="0" /> diff --git a/editor/icons/source/icon_move_down.svg b/editor/icons/source/icon_move_down.svg index e83a69ad50f..911def98b8c 100644 --- a/editor/icons/source/icon_move_down.svg +++ b/editor/icons/source/icon_move_down.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_arrow_left.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -28,9 +28,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="22.627417" - inkscape:cx="4.2997855" - inkscape:cy="8.3620593" + inkscape:zoom="32" + inkscape:cx="-0.21847599" + inkscape:cy="8.1503711" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -62,7 +62,7 @@ image/svg+xml - + @@ -72,9 +72,14 @@ id="layer1" transform="translate(0,-1036.3622)"> + diff --git a/editor/icons/source/icon_move_up.svg b/editor/icons/source/icon_move_up.svg index 8f671a0d725..4e24791efb8 100644 --- a/editor/icons/source/icon_move_up.svg +++ b/editor/icons/source/icon_move_up.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_arrow_left.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -28,9 +28,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="22.627417" - inkscape:cx="4.2997855" - inkscape:cy="8.3620593" + inkscape:zoom="32" + inkscape:cx="5.8620142" + inkscape:cy="9.0057643" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -62,7 +62,7 @@ image/svg+xml - + @@ -72,9 +72,14 @@ id="layer1" transform="translate(0,-1036.3622)"> + style="fill:none;stroke:#e0e0e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607843;stroke-miterlimit:4;stroke-dasharray:none" + d="m 4,1043.3622 4,-5 4,5" + id="path814" + inkscape:connector-curvature="0" /> + diff --git a/editor/icons/source/icon_new.svg b/editor/icons/source/icon_new.svg index a37ba1be3f3..d59dd3513a8 100644 --- a/editor/icons/source/icon_new.svg +++ b/editor/icons/source/icon_new.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_new.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -28,9 +28,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="0.22745062" - inkscape:cy="11.330333" + inkscape:zoom="22.627417" + inkscape:cx="20.922744" + inkscape:cy="2.4022924" inkscape:document-units="px" inkscape:current-layer="layer1-8" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="false" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -76,11 +76,17 @@ inkscape:label="Layer 1" transform="translate(0,-1.6949463e-5)"> + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccc" /> + diff --git a/editor/icons/source/icon_option_arrow.svg b/editor/icons/source/icon_option_arrow.svg new file mode 100644 index 00000000000..5cd943e9e3c --- /dev/null +++ b/editor/icons/source/icon_option_arrow.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_particles_material.svg b/editor/icons/source/icon_particles_material.svg new file mode 100644 index 00000000000..b4c2ef7ccd7 --- /dev/null +++ b/editor/icons/source/icon_particles_material.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/editor/icons/source/icon_play_button_group.svg b/editor/icons/source/icon_play_button_group.svg new file mode 100644 index 00000000000..84bdb00505d --- /dev/null +++ b/editor/icons/source/icon_play_button_group.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_scroll_bg.svg b/editor/icons/source/icon_scroll_bg.svg new file mode 100644 index 00000000000..29604b9e143 --- /dev/null +++ b/editor/icons/source/icon_scroll_bg.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + diff --git a/editor/icons/source/icon_scroll_grabber.svg b/editor/icons/source/icon_scroll_grabber.svg new file mode 100644 index 00000000000..b9d2bbbec03 --- /dev/null +++ b/editor/icons/source/icon_scroll_grabber.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_scroll_grabber_hl.svg b/editor/icons/source/icon_scroll_grabber_hl.svg new file mode 100644 index 00000000000..ce9a66c5bc1 --- /dev/null +++ b/editor/icons/source/icon_scroll_grabber_hl.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_search.svg b/editor/icons/source/icon_search.svg new file mode 100644 index 00000000000..bcd2ecca460 --- /dev/null +++ b/editor/icons/source/icon_search.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/editor/icons/source/icon_slider_grabber.svg b/editor/icons/source/icon_slider_grabber.svg new file mode 100644 index 00000000000..b13ca5d1a93 --- /dev/null +++ b/editor/icons/source/icon_slider_grabber.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_slider_grabber_hl.svg b/editor/icons/source/icon_slider_grabber_hl.svg new file mode 100644 index 00000000000..5d53811c555 --- /dev/null +++ b/editor/icons/source/icon_slider_grabber_hl.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_spatial_material.svg b/editor/icons/source/icon_spatial_material.svg new file mode 100644 index 00000000000..329354b716c --- /dev/null +++ b/editor/icons/source/icon_spatial_material.svg @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/editor/icons/source/icon_spinbox_updown.svg b/editor/icons/source/icon_spinbox_updown.svg new file mode 100644 index 00000000000..e29d7fe0d26 --- /dev/null +++ b/editor/icons/source/icon_spinbox_updown.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/editor/icons/source/icon_stream_texture.svg b/editor/icons/source/icon_stream_texture.svg new file mode 100644 index 00000000000..6ec701adff6 --- /dev/null +++ b/editor/icons/source/icon_stream_texture.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_tab_menu.svg b/editor/icons/source/icon_tab_menu.svg new file mode 100644 index 00000000000..39e0d1f2614 --- /dev/null +++ b/editor/icons/source/icon_tab_menu.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/editor/icons/source/icon_tabs.svg b/editor/icons/source/icon_tabs.svg index 79ed1e59100..c09a042033d 100644 --- a/editor/icons/source/icon_tabs.svg +++ b/editor/icons/source/icon_tabs.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_center_container.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -28,9 +28,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="22.627417" - inkscape:cx="11.687421" - inkscape:cy="9.3335226" + inkscape:zoom="32" + inkscape:cx="6.9623805" + inkscape:cy="8.3399158" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -71,73 +71,10 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)"> - - - - - - - + style="fill:#a5efac;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 5 4 C 3.8919904 4 3.1821539 4.9071 3 6 L 2 12 L 1 12 L 1 14 L 5 14 L 11 14 L 15 14 L 15 12 L 13 12 L 12 6 C 11.817843 4.9071 11.108009 4 10 4 L 5 4 z " + transform="translate(0,1036.3622)" + id="rect821" /> diff --git a/editor/icons/source/icon_tree_arrow_down.svg b/editor/icons/source/icon_tree_arrow_down.svg new file mode 100644 index 00000000000..1dd209720f6 --- /dev/null +++ b/editor/icons/source/icon_tree_arrow_down.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_tree_arrow_right.svg b/editor/icons/source/icon_tree_arrow_right.svg new file mode 100644 index 00000000000..43134ba1b1d --- /dev/null +++ b/editor/icons/source/icon_tree_arrow_right.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_tween.svg b/editor/icons/source/icon_tween.svg index 5cb5cad2279..7857c5f1874 100644 --- a/editor/icons/source/icon_tween.svg +++ b/editor/icons/source/icon_tween.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_tween.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="32" - inkscape:cx="6.0670176" - inkscape:cy="10.041334" + inkscape:cx="4.9605895" + inkscape:cy="8.5201258" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="false" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -71,28 +71,25 @@ id="layer1" transform="translate(0,-1036.3622)"> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + style="opacity:1;fill:#fbe87a;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + inkscape:connector-curvature="0" /> diff --git a/editor/icons/source/icon_unchecked.svg b/editor/icons/source/icon_unchecked.svg new file mode 100644 index 00000000000..053cbe6de53 --- /dev/null +++ b/editor/icons/source/icon_unchecked.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_vslider_bg.svg b/editor/icons/source/icon_vslider_bg.svg new file mode 100644 index 00000000000..b34dddc2d01 --- /dev/null +++ b/editor/icons/source/icon_vslider_bg.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/editor/icons/source/icon_vsplit_bg.svg b/editor/icons/source/icon_vsplit_bg.svg new file mode 100644 index 00000000000..e11940cf53a --- /dev/null +++ b/editor/icons/source/icon_vsplit_bg.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_vsplitter.svg b/editor/icons/source/icon_vsplitter.svg new file mode 100644 index 00000000000..80f7c2ce125 --- /dev/null +++ b/editor/icons/source/icon_vsplitter.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/editor/icons/source/icon_warning.svg b/editor/icons/source/icon_warning.svg index 4d39141a58a..d886fbdaeda 100644 --- a/editor/icons/source/icon_warning.svg +++ b/editor/icons/source/icon_warning.svg @@ -14,7 +14,7 @@ viewBox="0 0 8 8" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_node.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -29,7 +29,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="45.254832" - inkscape:cx="2.2320862" + inkscape:cx="-2.2536226" inkscape:cy="6.41947" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1"> @@ -76,6 +76,6 @@ height="8" x="0" y="1044.3622" - ry="1" /> + ry="4" /> diff --git a/editor/icons/source/icon_zoom.svg b/editor/icons/source/icon_zoom.svg index 811036b370b..de94ed96146 100644 --- a/editor/icons/source/icon_zoom.svg +++ b/editor/icons/source/icon_zoom.svg @@ -14,7 +14,7 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_zoom.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -28,9 +28,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="22.627417" - inkscape:cx="3.7772222" - inkscape:cy="11.922647" + inkscape:zoom="32" + inkscape:cx="9.872627" + inkscape:cy="8.8162049" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -42,8 +42,8 @@ inkscape:snap-bbox-midpoints="false" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1"> @@ -59,7 +59,7 @@ image/svg+xml - + @@ -70,18 +70,8 @@ transform="translate(0,-1036.3622)"> - + d="M 6 1 A 5 5 0 0 0 1 6 A 5 5 0 0 0 6 11 A 5 5 0 0 0 8.7519531 10.166016 L 13.070312 14.484375 L 14.484375 13.070312 L 10.166016 8.7519531 A 5 5 0 0 0 10.576172 8 L 10 8 L 10 6 L 9 6 A 3 3 0 0 1 6 9 A 3 3 0 0 1 3 6 A 3 3 0 0 1 6 3 A 3 3 0 0 1 8 3.7675781 L 8 2 L 8.9902344 2 A 5 5 0 0 0 6 1 z M 11 1 L 11 3 L 9 3 L 9 5 L 11 5 L 11 7 L 13 7 L 13 5 L 15 5 L 15 3 L 13 3 L 13 1 L 11 1 z " + transform="translate(0,1036.3622)" + id="path4135" /> diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 0be7b202a87..8a1e220fe34 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -118,8 +118,6 @@ void AnimationPlayerEditor::_notification(int p_what) { blend_editor.next->connect("item_selected", this, "_blend_editor_next_changed"); - nodename->set_icon(get_icon("AnimationPlayer", "EditorIcons")); - /* anim_editor_load->set_normal_texture( get_icon("AnimGet","EditorIcons")); anim_editor_store->set_normal_texture( get_icon("AnimSet","EditorIcons")); @@ -790,10 +788,6 @@ void AnimationPlayerEditor::_update_player() { player->get_animation_list(&animlist); animation->clear(); - if (player) - nodename->set_text(player->get_name()); - else - nodename->set_text(""); add_anim->set_disabled(player == NULL); load_anim->set_disabled(player == NULL); @@ -1367,8 +1361,6 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) { //tool_anim->get_popup()->add_item("Edit Anim Resource",TOOL_PASTE_ANIM); hb->add_child(tool_anim); - nodename = memnew(Button); - hb->add_child(nodename); pin = memnew(ToolButton); pin->set_toggle_mode(true); hb->add_child(pin); diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h index a042da14df0..ac60090d15e 100644 --- a/editor/plugins/animation_player_editor_plugin.h +++ b/editor/plugins/animation_player_editor_plugin.h @@ -85,7 +85,6 @@ class AnimationPlayerEditor : public VBoxContainer { Button *remove_anim; MenuButton *tool_anim; ToolButton *pin; - Button *nodename; SpinBox *frame; LineEdit *scale; LineEdit *name; diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 1a533dce32d..b64dffc5bc9 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -1837,7 +1837,7 @@ void CanvasItemEditor::_viewport_draw() { if (h_scroll->is_visible_in_tree()) size.height -= h_scroll->get_size().height; - get_stylebox("EditorFocus", "EditorStyles")->draw(ci, Rect2(Point2(), size)); + get_stylebox("Focus", "EditorStyles")->draw(ci, Rect2(Point2(), size)); } Ref lock = get_icon("Lock", "EditorIcons"); diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index d233ae6a241..a7d727d9b4e 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -2111,7 +2111,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { script_split->set_split_offset(140); tab_container = memnew(TabContainer); - tab_container->add_style_override("panel", p_editor->get_gui_base()->get_stylebox("EditorBG", "EditorStyles")); + tab_container->add_style_override("panel", p_editor->get_gui_base()->get_stylebox("ScriptPanel", "EditorStyles")); tab_container->set_tabs_visible(false); script_split->add_child(tab_container); diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index d73349f773c..62670f53d74 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -519,12 +519,12 @@ static int _get_key_modifier(const String &p_property) { return 0; } -bool SpatialEditorViewport::_gizmo_select(const Vector2 &p_screenpos, bool p_hilite_only) { +bool SpatialEditorViewport::_gizmo_select(const Vector2 &p_screenpos, bool p_highlight_only) { if (!spatial_editor->is_gizmo_visible()) return false; if (get_selected_count() == 0) { - if (p_hilite_only) + if (p_highlight_only) spatial_editor->select_gizmo_highlight_axis(-1); return false; } @@ -557,7 +557,7 @@ bool SpatialEditorViewport::_gizmo_select(const Vector2 &p_screenpos, bool p_hil if (col_axis != -1) { - if (p_hilite_only) { + if (p_highlight_only) { spatial_editor->select_gizmo_highlight_axis(col_axis); @@ -597,7 +597,7 @@ bool SpatialEditorViewport::_gizmo_select(const Vector2 &p_screenpos, bool p_hil if (col_axis != -1) { - if (p_hilite_only) { + if (p_highlight_only) { spatial_editor->select_gizmo_highlight_axis(col_axis + 3); } else { @@ -610,7 +610,7 @@ bool SpatialEditorViewport::_gizmo_select(const Vector2 &p_screenpos, bool p_hil } } - if (p_hilite_only) + if (p_highlight_only) spatial_editor->select_gizmo_highlight_axis(-1); return false; @@ -1679,7 +1679,7 @@ void SpatialEditorViewport::_draw() { if (surface->has_focus()) { Size2 size = surface->get_size(); Rect2 r = Rect2(Point2(), size); - get_stylebox("EditorFocus", "EditorStyles")->draw(surface->get_canvas_item(), r); + get_stylebox("Focus", "EditorStyles")->draw(surface->get_canvas_item(), r); } RID ci = surface->get_canvas_item(); diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index 43029274268..99937bdf379 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -140,7 +140,7 @@ private: Vector3 _get_screen_to_space(const Vector3 &p_vector3); void _select_region(); - bool _gizmo_select(const Vector2 &p_screenpos, bool p_hilite_only = false); + bool _gizmo_select(const Vector2 &p_screenpos, bool p_highlight_only = false); float get_znear() const; float get_zfar() const; diff --git a/editor/project_export.cpp b/editor/project_export.cpp index 90db23d2364..e11c535ed5d 100644 --- a/editor/project_export.cpp +++ b/editor/project_export.cpp @@ -752,6 +752,7 @@ ProjectExportDialog::ProjectExportDialog() { settings_vb->add_child(runnable); sections = memnew(TabContainer); + sections->set_tab_align(TabContainer::ALIGN_LEFT); settings_vb->add_child(sections); sections->set_v_size_flags(SIZE_EXPAND_FILL); diff --git a/editor/project_settings.cpp b/editor/project_settings.cpp index 33d0a45321e..6c001bb65cb 100644 --- a/editor/project_settings.cpp +++ b/editor/project_settings.cpp @@ -106,6 +106,9 @@ void ProjectSettings::_notification(int p_what) { case NOTIFICATION_POPUP_HIDE: { EditorSettings::get_singleton()->set("interface/dialogs/project_settings_bounds", get_rect()); } break; + case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { + _update_actions(); + } break; } } @@ -1174,6 +1177,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) { data = p_data; tab_container = memnew(TabContainer); + tab_container->set_tab_align(TabContainer::ALIGN_LEFT); add_child(tab_container); //set_child_rect(tab_container); @@ -1416,6 +1420,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) { //translations TabContainer *translations = memnew(TabContainer); + translations->set_tab_align(TabContainer::ALIGN_LEFT); translations->set_name(TTR("Localization")); tab_container->add_child(translations); diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 5ff5e680f61..e2acf7ae300 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -2750,6 +2750,10 @@ void PropertyEditor::_notification(int p_what) { changing = false; } + + if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { + update_tree(); + } } TreeItem *PropertyEditor::get_parent_node(String p_path, HashMap &item_paths, TreeItem *root) { diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index d3590db64f0..ec5730a0c82 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -681,7 +681,7 @@ void SceneTreeDock::_notification(int p_what) { button_create_script->set_icon(get_icon("ScriptCreate", "EditorIcons")); button_clear_script->set_icon(get_icon("ScriptRemove", "EditorIcons")); - filter_icon->set_texture(get_icon("Zoom", "EditorIcons")); + filter_icon->set_texture(get_icon("Search", "EditorIcons")); EditorNode::get_singleton()->get_editor_selection()->connect("selection_changed", this, "_selection_changed"); @@ -1828,6 +1828,7 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel filter->set_h_size_flags(SIZE_EXPAND_FILL); filter_hbc->add_child(filter); filter_icon = memnew(TextureRect); + filter_icon->set_custom_minimum_size(Size2(24 * EDSCALE, 0)); filter_hbc->add_child(filter_icon); filter_icon->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED); filter->connect("text_changed", this, "_filter_changed"); diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index 04c3652f4a5..336ee54bde9 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -999,6 +999,11 @@ void ScriptEditorDebugger::_notification(int p_what) { } } break; + case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { + tabs->add_style_override("panel", editor->get_gui_base()->get_stylebox("DebuggerPanel", "EditorStyles")); + tabs->add_style_override("tab_fg", editor->get_gui_base()->get_stylebox("DebuggerTabFG", "EditorStyles")); + tabs->add_style_override("tab_bg", editor->get_gui_base()->get_stylebox("DebuggerTabBG", "EditorStyles")); + } break; } } @@ -1551,9 +1556,10 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { editor = p_editor; tabs = memnew(TabContainer); - tabs->add_style_override("panel", editor->get_gui_base()->get_stylebox("EditorPanelDebugger", "EditorStyles")); - tabs->add_style_override("tab_fg", editor->get_gui_base()->get_stylebox("EditorTabFGDebugger", "EditorStyles")); - tabs->add_style_override("tab_bg", editor->get_gui_base()->get_stylebox("EditorTabBGDebugger", "EditorStyles")); + tabs->set_tab_align(TabContainer::ALIGN_LEFT); + tabs->add_style_override("panel", editor->get_gui_base()->get_stylebox("DebuggerPanel", "EditorStyles")); + tabs->add_style_override("tab_fg", editor->get_gui_base()->get_stylebox("DebuggerTabFG", "EditorStyles")); + tabs->add_style_override("tab_bg", editor->get_gui_base()->get_stylebox("DebuggerTabBG", "EditorStyles")); tabs->set_v_size_flags(SIZE_EXPAND_FILL); tabs->set_area_as_parent_rect(); add_child(tabs); diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index 8c878579447..16ab431321c 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -300,6 +300,7 @@ EditorSettingsDialog::EditorSettingsDialog() { set_resizable(true); tabs = memnew(TabContainer); + tabs->set_tab_align(TabContainer::ALIGN_LEFT); add_child(tabs); //set_child_rect(tabs); diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index 6fcc878e117..a4567592812 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -69,6 +69,7 @@ void Button::_notification(int p_what) { RID ci = get_canvas_item(); Size2 size = get_size(); Color color; + Color color_icon(1, 1, 1, 1); //print_line(get_text()+": "+itos(is_flat())+" hover "+itos(get_draw_mode())); @@ -82,6 +83,8 @@ void Button::_notification(int p_what) { if (!flat) style->draw(ci, Rect2(Point2(0, 0), size)); color = get_color("font_color"); + if (has_color("icon_color_normal")) + color_icon = get_color("icon_color_normal"); } break; case DRAW_PRESSED: { @@ -91,6 +94,8 @@ void Button::_notification(int p_what) { color = get_color("font_color_pressed"); else color = get_color("font_color"); + if (has_color("icon_color_pressed")) + color_icon = get_color("icon_color_pressed"); } break; case DRAW_HOVER: { @@ -98,6 +103,8 @@ void Button::_notification(int p_what) { style = get_stylebox("hover"); style->draw(ci, Rect2(Point2(0, 0), size)); color = get_color("font_color_hover"); + if (has_color("icon_color_hover")) + color_icon = get_color("icon_color_hover"); } break; case DRAW_DISABLED: { @@ -105,6 +112,8 @@ void Button::_notification(int p_what) { style = get_stylebox("disabled"); style->draw(ci, Rect2(Point2(0, 0), size)); color = get_color("font_color_disabled"); + if (has_color("icon_color_disabled")) + color_icon = get_color("icon_color_disabled"); } break; } @@ -148,8 +157,9 @@ void Button::_notification(int p_what) { if (!_icon.is_null()) { int valign = size.height - style->get_minimum_size().y; - - _icon->draw(ci, style->get_offset() + Point2(0, Math::floor((valign - _icon->get_height()) / 2.0)), is_disabled() ? Color(1, 1, 1, 0.4) : Color(1, 1, 1)); + if (is_disabled()) + color_icon.a = 0.4; + _icon->draw(ci, style->get_offset() + Point2(0, Math::floor((valign - _icon->get_height()) / 2.0)), color_icon); } } } diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index cf5321e9073..053be515acf 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -53,25 +53,34 @@ void WindowDialog::_fix_size() { Size2i viewport_size = get_viewport_rect().size; // Windows require additional padding to keep the window chrome visible. - Ref panel = get_stylebox("panel", "WindowDialog"); - + Ref panel = get_stylebox("panel", "WindowDialog"); + float top = 0; + float left = 0; + float bottom = 0; + float right = 0; // Check validity, because the theme could contain a different type of StyleBox - if (panel.is_valid()) { - float top = panel->get_expand_margin_size(MARGIN_TOP); - float left = panel->get_expand_margin_size(MARGIN_LEFT); - float bottom = panel->get_expand_margin_size(MARGIN_BOTTOM); - float right = panel->get_expand_margin_size(MARGIN_RIGHT); + if (panel->get_class() == "StyleBoxTexture") { + Ref panel_texture = panel->cast_to(); + top = panel_texture->get_expand_margin_size(MARGIN_TOP); + left = panel_texture->get_expand_margin_size(MARGIN_LEFT); + bottom = panel_texture->get_expand_margin_size(MARGIN_BOTTOM); + right = panel_texture->get_expand_margin_size(MARGIN_RIGHT); + } else if (panel->get_class() == "StyleBoxFlat") { + Ref panel_flat = panel->cast_to(); + top = panel_flat->_get_additional_border_size(MARGIN_TOP); + left = panel_flat->_get_additional_border_size(MARGIN_LEFT); + bottom = panel_flat->_get_additional_border_size(MARGIN_BOTTOM); + right = panel_flat->_get_additional_border_size(MARGIN_RIGHT); + } - pos.x = MAX(left, MIN(pos.x, viewport_size.x - size.x - right)); - pos.y = MAX(top, MIN(pos.y, viewport_size.y - size.y - bottom)); - set_global_position(pos); + pos.x = MAX(left, MIN(pos.x, viewport_size.x - size.x - right)); + pos.y = MAX(top, MIN(pos.y, viewport_size.y - size.y - bottom)); + set_global_position(pos); - // Also resize the window to fit if a resize should be possible at all. - if (resizable) { - size.x = MIN(size.x, viewport_size.x - left - right); - size.y = MIN(size.y, viewport_size.y - top - bottom); - set_size(size); - } + if (resizable) { + size.x = MIN(size.x, viewport_size.x - left - right); + size.y = MIN(size.y, viewport_size.y - top - bottom); + set_size(size); } } @@ -200,7 +209,7 @@ void WindowDialog::_notification(int p_what) { case NOTIFICATION_ENTER_TREE: { close_button->set_normal_texture(get_icon("close", "WindowDialog")); close_button->set_pressed_texture(get_icon("close", "WindowDialog")); - close_button->set_hover_texture(get_icon("close_hilite", "WindowDialog")); + close_button->set_hover_texture(get_icon("close_highlight", "WindowDialog")); close_button->set_anchor(MARGIN_LEFT, ANCHOR_END); close_button->set_begin(Point2(get_constant("close_h_ofs", "WindowDialog"), -get_constant("close_v_ofs", "WindowDialog"))); } break; diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index 6475371eb95..bf44493b516 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -151,24 +151,24 @@ void ScrollBar::_gui_input(InputEvent p_event) { double incr_size = orientation == VERTICAL ? incr->get_height() : incr->get_width(); double total = orientation == VERTICAL ? get_size().height : get_size().width; - HiliteStatus new_hilite; + HighlightStatus new_highlight; if (ofs < decr_size) { - new_hilite = HILITE_DECR; + new_highlight = HIGHLIGHT_DECR; } else if (ofs > total - incr_size) { - new_hilite = HILITE_INCR; + new_highlight = HIGHLIGHT_INCR; } else { - new_hilite = HILITE_RANGE; + new_highlight = HIGHLIGHT_RANGE; } - if (new_hilite != hilite) { + if (new_highlight != highlight) { - hilite = new_hilite; + highlight = new_highlight; update(); } } @@ -233,10 +233,10 @@ void ScrollBar::_notification(int p_what) { RID ci = get_canvas_item(); - Ref decr = hilite == HILITE_DECR ? get_icon("decrement_hilite") : get_icon("decrement"); - Ref incr = hilite == HILITE_INCR ? get_icon("increment_hilite") : get_icon("increment"); + Ref decr = highlight == HIGHLIGHT_DECR ? get_icon("decrement_highlight") : get_icon("decrement"); + Ref incr = highlight == HIGHLIGHT_INCR ? get_icon("increment_highlight") : get_icon("increment"); Ref bg = has_focus() ? get_stylebox("scroll_focus") : get_stylebox("scroll"); - Ref grabber = (drag.active || hilite == HILITE_RANGE) ? get_stylebox("grabber_hilite") : get_stylebox("grabber"); + Ref grabber = (drag.active || highlight == HIGHLIGHT_RANGE) ? get_stylebox("grabber_highlight") : get_stylebox("grabber"); Point2 ofs; @@ -386,7 +386,7 @@ void ScrollBar::_notification(int p_what) { if (p_what == NOTIFICATION_MOUSE_EXIT) { - hilite = HILITE_NONE; + highlight = HIGHLIGHT_NONE; update(); } } @@ -784,7 +784,7 @@ void ScrollBar::_bind_methods() { ScrollBar::ScrollBar(Orientation p_orientation) { orientation = p_orientation; - hilite = HILITE_NONE; + highlight = HIGHLIGHT_NONE; custom_step = -1; drag_slave = NULL; diff --git a/scene/gui/scroll_bar.h b/scene/gui/scroll_bar.h index 9f035b49014..cb6bf227a00 100644 --- a/scene/gui/scroll_bar.h +++ b/scene/gui/scroll_bar.h @@ -39,11 +39,11 @@ class ScrollBar : public Range { GDCLASS(ScrollBar, Range); - enum HiliteStatus { - HILITE_NONE, - HILITE_DECR, - HILITE_RANGE, - HILITE_INCR, + enum HighlightStatus { + HIGHLIGHT_NONE, + HIGHLIGHT_DECR, + HIGHLIGHT_RANGE, + HIGHLIGHT_INCR, }; static bool focus_by_default; @@ -52,7 +52,7 @@ class ScrollBar : public Range { Size2 size; float custom_step; - HiliteStatus hilite; + HighlightStatus highlight; struct Drag { diff --git a/scene/gui/slider.cpp b/scene/gui/slider.cpp index d2a2ff79662..ae52d6d4529 100644 --- a/scene/gui/slider.cpp +++ b/scene/gui/slider.cpp @@ -45,7 +45,7 @@ void Slider::_gui_input(InputEvent p_event) { if (mb.button_index == BUTTON_LEFT) { if (mb.pressed) { - Ref grabber = get_icon(mouse_inside || has_focus() ? "grabber_hilite" : "grabber"); + Ref grabber = get_icon(mouse_inside || has_focus() ? "grabber_highlight" : "grabber"); grab.pos = orientation == VERTICAL ? mb.y : mb.x; double grab_width = (double)grabber->get_size().width; double grab_height = (double)grabber->get_size().height; @@ -153,7 +153,7 @@ void Slider::_notification(int p_what) { Size2i size = get_size(); Ref style = get_stylebox("slider"); Ref focus = get_stylebox("focus"); - Ref grabber = get_icon(mouse_inside || has_focus() ? "grabber_hilite" : "grabber"); + Ref grabber = get_icon(mouse_inside || has_focus() ? "grabber_highlight" : "grabber"); Ref tick = get_icon("tick"); if (orientation == VERTICAL) { diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp index fb27f3b0175..797082f17ce 100644 --- a/scene/gui/tabs.cpp +++ b/scene/gui/tabs.cpp @@ -85,7 +85,7 @@ void Tabs::_gui_input(const InputEvent &p_event) { Point2 pos(p_event.mouse_motion.x, p_event.mouse_motion.y); - hilite_arrow = -1; + highlight_arrow = -1; if (buttons_visible) { Ref incr = get_icon("increment"); @@ -94,9 +94,9 @@ void Tabs::_gui_input(const InputEvent &p_event) { int limit = get_size().width - incr->get_width() - decr->get_width(); if (pos.x > limit + decr->get_width()) { - hilite_arrow = 1; + highlight_arrow = 1; } else if (pos.x > limit) { - hilite_arrow = 0; + highlight_arrow = 0; } } @@ -268,8 +268,8 @@ void Tabs::_notification(int p_what) { Ref incr = get_icon("increment"); Ref decr = get_icon("decrement"); - Ref incr_hl = get_icon("increment_hilite"); - Ref decr_hl = get_icon("decrement_hilite"); + Ref incr_hl = get_icon("increment_highlight"); + Ref decr_hl = get_icon("decrement_highlight"); int limit = get_size().width - incr->get_size().width - decr->get_size().width; @@ -385,12 +385,12 @@ void Tabs::_notification(int p_what) { int vofs = (get_size().height - incr->get_size().height) / 2; if (offset > 0) - draw_texture(hilite_arrow == 0 ? decr_hl : decr, Point2(limit, vofs)); + draw_texture(highlight_arrow == 0 ? decr_hl : decr, Point2(limit, vofs)); else draw_texture(decr, Point2(limit, vofs), Color(1, 1, 1, 0.5)); if (missing_right) - draw_texture(hilite_arrow == 1 ? incr_hl : incr, Point2(limit + decr->get_size().width, vofs)); + draw_texture(highlight_arrow == 1 ? incr_hl : incr, Point2(limit + decr->get_size().width, vofs)); else draw_texture(incr, Point2(limit + decr->get_size().width, vofs), Color(1, 1, 1, 0.5)); @@ -677,7 +677,7 @@ Tabs::Tabs() { tab_align = ALIGN_CENTER; rb_hover = -1; rb_pressing = false; - hilite_arrow = -1; + highlight_arrow = -1; cb_hover = -1; cb_pressing = false; diff --git a/scene/gui/tabs.h b/scene/gui/tabs.h index 2392327206f..131526f298d 100644 --- a/scene/gui/tabs.h +++ b/scene/gui/tabs.h @@ -69,7 +69,7 @@ private: int offset; int max_drawn_tab; - int hilite_arrow; + int highlight_arrow; bool buttons_visible; bool missing_right; Vector tabs; diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 3a824a56a35..858e5386b93 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -487,43 +487,43 @@ void fill_default_theme(Ref &t, const Ref &default_font, const Ref< t->set_stylebox("scroll", "HScrollBar", make_stylebox(scroll_bg_png, 5, 5, 5, 5, 0, 0, 0, 0)); t->set_stylebox("scroll_focus", "HScrollBar", make_stylebox(scroll_bg_png, 5, 5, 5, 5, 0, 0, 0, 0)); t->set_stylebox("grabber", "HScrollBar", make_stylebox(scroll_grabber_png, 5, 5, 5, 5, 2, 2, 2, 2)); - t->set_stylebox("grabber_hilite", "HScrollBar", make_stylebox(scroll_grabber_hl_png, 5, 5, 5, 5, 2, 2, 2, 2)); + t->set_stylebox("grabber_highlight", "HScrollBar", make_stylebox(scroll_grabber_hl_png, 5, 5, 5, 5, 2, 2, 2, 2)); t->set_icon("increment", "HScrollBar", empty_icon); - t->set_icon("increment_hilite", "HScrollBar", empty_icon); + t->set_icon("increment_highlight", "HScrollBar", empty_icon); t->set_icon("decrement", "HScrollBar", empty_icon); - t->set_icon("decrement_hilite", "HScrollBar", empty_icon); + t->set_icon("decrement_highlight", "HScrollBar", empty_icon); // VScrollBar t->set_stylebox("scroll", "VScrollBar", make_stylebox(scroll_bg_png, 5, 5, 5, 5, 0, 0, 0, 0)); t->set_stylebox("scroll_focus", "VScrollBar", make_stylebox(scroll_bg_png, 5, 5, 5, 5, 0, 0, 0, 0)); t->set_stylebox("grabber", "VScrollBar", make_stylebox(scroll_grabber_png, 5, 5, 5, 5, 2, 2, 2, 2)); - t->set_stylebox("grabber_hilite", "VScrollBar", make_stylebox(scroll_grabber_hl_png, 5, 5, 5, 5, 2, 2, 2, 2)); + t->set_stylebox("grabber_highlight", "VScrollBar", make_stylebox(scroll_grabber_hl_png, 5, 5, 5, 5, 2, 2, 2, 2)); t->set_icon("increment", "VScrollBar", empty_icon); - t->set_icon("increment_hilite", "VScrollBar", empty_icon); + t->set_icon("increment_highlight", "VScrollBar", empty_icon); t->set_icon("decrement", "VScrollBar", empty_icon); - t->set_icon("decrement_hilite", "VScrollBar", empty_icon); + t->set_icon("decrement_highlight", "VScrollBar", empty_icon); // HSlider t->set_stylebox("slider", "HSlider", make_stylebox(hslider_bg_png, 4, 4, 4, 4)); - t->set_stylebox("grabber_hilite", "HSlider", make_stylebox(hslider_grabber_hl_png, 6, 6, 6, 6)); + t->set_stylebox("grabber_highlight", "HSlider", make_stylebox(hslider_grabber_hl_png, 6, 6, 6, 6)); t->set_stylebox("focus", "HSlider", focus); t->set_icon("grabber", "HSlider", make_icon(hslider_grabber_png)); - t->set_icon("grabber_hilite", "HSlider", make_icon(hslider_grabber_hl_png)); + t->set_icon("grabber_highlight", "HSlider", make_icon(hslider_grabber_hl_png)); t->set_icon("tick", "HSlider", make_icon(hslider_tick_png)); // VSlider t->set_stylebox("slider", "VSlider", make_stylebox(vslider_bg_png, 4, 4, 4, 4)); - t->set_stylebox("grabber_hilite", "VSlider", make_stylebox(vslider_grabber_hl_png, 6, 6, 6, 6)); + t->set_stylebox("grabber_highlight", "VSlider", make_stylebox(vslider_grabber_hl_png, 6, 6, 6, 6)); t->set_stylebox("focus", "HSlider", focus); t->set_icon("grabber", "VSlider", make_icon(vslider_grabber_png)); - t->set_icon("grabber_hilite", "VSlider", make_icon(vslider_grabber_hl_png)); + t->set_icon("grabber_highlight", "VSlider", make_icon(vslider_grabber_hl_png)); t->set_icon("tick", "VSlider", make_icon(vslider_tick_png)); // SpinBox @@ -540,7 +540,7 @@ void fill_default_theme(Ref &t, const Ref &default_font, const Ref< t->set_constant("title_height", "WindowDialog", 20 * scale); t->set_icon("close", "WindowDialog", make_icon(close_png)); - t->set_icon("close_hilite", "WindowDialog", make_icon(close_hl_png)); + t->set_icon("close_highlight", "WindowDialog", make_icon(close_hl_png)); t->set_constant("close_h_ofs", "WindowDialog", 18 * scale); t->set_constant("close_v_ofs", "WindowDialog", 18 * scale); @@ -683,15 +683,14 @@ void fill_default_theme(Ref &t, const Ref &default_font, const Ref< t->set_stylebox("tab_fg", "TabContainer", sb_expand(make_stylebox(tab_current_png, 4, 4, 4, 1, 16, 4, 16, 4), 2, 2, 2, 2)); t->set_stylebox("tab_bg", "TabContainer", sb_expand(make_stylebox(tab_behind_png, 5, 5, 5, 1, 16, 6, 16, 4), 3, 0, 3, 3)); - t->set_stylebox("tab_disabled", "TabContainer", sb_expand(make_stylebox(tab_disabled_png, 5, 5, 5, 1, 16, 6, 16, 4), 3, 0, 3, 3)); t->set_stylebox("panel", "TabContainer", tc_sb); t->set_icon("increment", "TabContainer", make_icon(scroll_button_right_png)); - t->set_icon("increment_hilite", "TabContainer", make_icon(scroll_button_right_hl_png)); + t->set_icon("increment_highlight", "TabContainer", make_icon(scroll_button_right_hl_png)); t->set_icon("decrement", "TabContainer", make_icon(scroll_button_left_png)); - t->set_icon("decrement_hilite", "TabContainer", make_icon(scroll_button_left_hl_png)); + t->set_icon("decrement_highlight", "TabContainer", make_icon(scroll_button_left_hl_png)); t->set_icon("menu", "TabContainer", make_icon(tab_menu_png)); - t->set_icon("menu_hilite", "TabContainer", make_icon(tab_menu_hl_png)); + t->set_icon("menu_highlight", "TabContainer", make_icon(tab_menu_hl_png)); t->set_font("font", "TabContainer", default_font); @@ -709,15 +708,14 @@ void fill_default_theme(Ref &t, const Ref &default_font, const Ref< t->set_stylebox("tab_fg", "Tabs", sb_expand(make_stylebox(tab_current_png, 4, 3, 4, 1, 16, 3, 16, 2), 2, 2, 2, 2)); t->set_stylebox("tab_bg", "Tabs", sb_expand(make_stylebox(tab_behind_png, 5, 4, 5, 1, 16, 5, 16, 2), 3, 3, 3, 3)); - t->set_stylebox("tab_disabled", "Tabs", sb_expand(make_stylebox(tab_disabled_png, 5, 4, 5, 1, 16, 5, 16, 2), 3, 3, 3, 3)); t->set_stylebox("panel", "Tabs", tc_sb); t->set_stylebox("button_pressed", "Tabs", make_stylebox(button_pressed_png, 4, 4, 4, 4)); t->set_stylebox("button", "Tabs", make_stylebox(button_normal_png, 4, 4, 4, 4)); t->set_icon("increment", "Tabs", make_icon(scroll_button_right_png)); - t->set_icon("increment_hilite", "Tabs", make_icon(scroll_button_right_hl_png)); + t->set_icon("increment_highlight", "Tabs", make_icon(scroll_button_right_hl_png)); t->set_icon("decrement", "Tabs", make_icon(scroll_button_left_png)); - t->set_icon("decrement_hilite", "Tabs", make_icon(scroll_button_left_hl_png)); + t->set_icon("decrement_highlight", "Tabs", make_icon(scroll_button_left_hl_png)); t->set_icon("close", "Tabs", make_icon(tab_close_png)); t->set_font("font", "Tabs", default_font); diff --git a/scene/resources/default_theme/theme_data.h b/scene/resources/default_theme/theme_data.h index 12dbe615c5b..b9c401525aa 100644 --- a/scene/resources/default_theme/theme_data.h +++ b/scene/resources/default_theme/theme_data.h @@ -1,4 +1,4 @@ -// THIS FILE HAS BEEN AUTOGENERATED, DONT EDIT!! +// THIS FILE HAS BEEN AUTOGENERATED, DON'T EDIT!! // png image block @@ -366,10 +366,6 @@ static const unsigned char tab_current_png[] = { 0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 0x0, 0x0, 0x0, 0xd, 0x49, 0x48, 0x44, 0x52, 0x0, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0x10, 0x8, 0x3, 0x0, 0x0, 0x0, 0x28, 0x2d, 0xf, 0x53, 0x0, 0x0, 0x0, 0x4, 0x67, 0x41, 0x4d, 0x41, 0x0, 0x0, 0xb1, 0x8f, 0xb, 0xfc, 0x61, 0x5, 0x0, 0x0, 0x0, 0x20, 0x63, 0x48, 0x52, 0x4d, 0x0, 0x0, 0x7a, 0x26, 0x0, 0x0, 0x80, 0x84, 0x0, 0x0, 0xfa, 0x0, 0x0, 0x0, 0x80, 0xe8, 0x0, 0x0, 0x75, 0x30, 0x0, 0x0, 0xea, 0x60, 0x0, 0x0, 0x3a, 0x98, 0x0, 0x0, 0x17, 0x70, 0x9c, 0xba, 0x51, 0x3c, 0x0, 0x0, 0x0, 0x9c, 0x50, 0x4c, 0x54, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x3d, 0x48, 0x5b, 0x58, 0x66, 0x5b, 0x57, 0x65, 0x57, 0x54, 0x62, 0x55, 0x53, 0x62, 0x4a, 0x46, 0x52, 0x46, 0x41, 0x4e, 0x45, 0x41, 0x4d, 0x55, 0x52, 0x60, 0x44, 0x41, 0x4c, 0x53, 0x50, 0x5e, 0x43, 0x40, 0x4b, 0x52, 0x4e, 0x5d, 0x41, 0x3e, 0x4a, 0x4f, 0x4d, 0x5a, 0x3f, 0x3d, 0x48, 0x4e, 0x4b, 0x59, 0x3e, 0x3c, 0x47, 0x4d, 0x4a, 0x58, 0x3d, 0x3b, 0x46, 0x4b, 0x49, 0x54, 0x3c, 0x3a, 0x44, 0x4b, 0x47, 0x54, 0x3b, 0x39, 0x43, 0x3b, 0x39, 0x42, 0x3b, 0x38, 0x43, 0x3b, 0x38, 0x42, 0x3a, 0x37, 0x41, 0x39, 0x37, 0x41, 0x3a, 0x38, 0x41, 0x39, 0x36, 0x3f, 0x38, 0x36, 0x3f, 0x39, 0x36, 0x40, 0x38, 0x36, 0x40, 0x37, 0x35, 0x3e, 0x37, 0x34, 0x3e, 0x36, 0x35, 0x3d, 0x35, 0x32, 0x3b, 0x59, 0xdd, 0xd3, 0xff, 0x0, 0x0, 0x0, 0x11, 0x74, 0x52, 0x4e, 0x53, 0x4, 0xa, 0x11, 0x19, 0x1f, 0x22, 0x24, 0x15, 0x25, 0x34, 0x3f, 0x46, 0x47, 0x48, 0x77, 0xef, 0xef, 0xa3, 0x31, 0x6b, 0xc2, 0x0, 0x0, 0x0, 0x1, 0x62, 0x4b, 0x47, 0x44, 0x33, 0x37, 0xd5, 0x7c, 0x5e, 0x0, 0x0, 0x0, 0x9, 0x70, 0x48, 0x59, 0x73, 0x0, 0x0, 0xb, 0x13, 0x0, 0x0, 0xb, 0x13, 0x1, 0x0, 0x9a, 0x9c, 0x18, 0x0, 0x0, 0x0, 0x7, 0x74, 0x49, 0x4d, 0x45, 0x7, 0xe0, 0x6, 0x16, 0x12, 0x2b, 0x5, 0x39, 0x1a, 0x32, 0x39, 0x0, 0x0, 0x0, 0xa2, 0x49, 0x44, 0x41, 0x54, 0x18, 0xd3, 0x45, 0xcd, 0xd9, 0x12, 0x82, 0x30, 0xc, 0x40, 0xd1, 0x0, 0x2d, 0x4b, 0x5b, 0x36, 0x59, 0x44, 0x44, 0x44, 0xa4, 0x68, 0x59, 0x54, 0xfc, 0xff, 0x8f, 0x33, 0x30, 0x4c, 0x3d, 0x93, 0xa7, 0x3b, 0x93, 0x4, 0xc0, 0x30, 0x2d, 0x42, 0x6d, 0x44, 0x89, 0x65, 0x1a, 0x0, 0x86, 0xe3, 0x7a, 0x8c, 0xb, 0xdf, 0x17, 0x9c, 0x79, 0xae, 0x63, 0x80, 0xe9, 0x6, 0x61, 0x7c, 0xd8, 0xc4, 0x61, 0xe0, 0x9a, 0x60, 0x79, 0x51, 0x92, 0x66, 0x9b, 0x34, 0x89, 0x3c, 0xb, 0x8, 0xcb, 0xb3, 0xe3, 0x2e, 0xcb, 0x19, 0x1, 0xca, 0x8b, 0x93, 0x56, 0x70, 0xa, 0xb6, 0x28, 0xcf, 0x5a, 0x29, 0x6c, 0xb0, 0xfd, 0xea, 0xa2, 0x55, 0xfe, 0x1a, 0xea, 0xab, 0x56, 0xaf, 0x41, 0x34, 0x37, 0xad, 0xc1, 0x15, 0xca, 0xdb, 0xbb, 0xd6, 0xe2, 0x51, 0xc2, 0xba, 0x7f, 0xe8, 0xf0, 0x2d, 0x6, 0x29, 0xfb, 0x5e, 0xca, 0xc7, 0x53, 0xca, 0x3d, 0xa8, 0x61, 0x50, 0xc3, 0xa8, 0xc6, 0x41, 0xed, 0x61, 0x9a, 0xa6, 0x19, 0xbd, 0xe6, 0xf7, 0x1e, 0x3e, 0xcb, 0x82, 0x83, 0xbe, 0x18, 0x7e, 0xa1, 0xe5, 0x17, 0x1f, 0xcf, 0x5d, 0x82, 0x6b, 0x0, 0x0, 0x0, 0x25, 0x74, 0x45, 0x58, 0x74, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x0, 0x32, 0x30, 0x31, 0x36, 0x2d, 0x30, 0x36, 0x2d, 0x32, 0x32, 0x54, 0x32, 0x30, 0x3a, 0x33, 0x39, 0x3a, 0x32, 0x36, 0x2b, 0x30, 0x32, 0x3a, 0x30, 0x30, 0xc9, 0xad, 0xc8, 0x52, 0x0, 0x0, 0x0, 0x25, 0x74, 0x45, 0x58, 0x74, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x0, 0x32, 0x30, 0x31, 0x36, 0x2d, 0x30, 0x36, 0x2d, 0x32, 0x32, 0x54, 0x32, 0x30, 0x3a, 0x33, 0x39, 0x3a, 0x32, 0x36, 0x2b, 0x30, 0x32, 0x3a, 0x30, 0x30, 0xb8, 0xf0, 0x70, 0xee, 0x0, 0x0, 0x0, 0x0, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82 }; -static const unsigned char tab_disabled_png[] = { - 0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 0x0, 0x0, 0x0, 0xd, 0x49, 0x48, 0x44, 0x52, 0x0, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0x10, 0x8, 0x6, 0x0, 0x0, 0x0, 0x1f, 0xf3, 0xff, 0x61, 0x0, 0x0, 0x0, 0x9, 0x70, 0x48, 0x59, 0x73, 0x0, 0x0, 0xb, 0x12, 0x0, 0x0, 0xb, 0x12, 0x1, 0xd2, 0xdd, 0x7e, 0xfc, 0x0, 0x0, 0x0, 0xd2, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0xd5, 0x90, 0x51, 0xa, 0xc2, 0x30, 0xc, 0x86, 0xd3, 0x2e, 0xdb, 0x4, 0x1f, 0xb6, 0x57, 0x75, 0x77, 0xd9, 0x1d, 0x3c, 0x8d, 0x47, 0xd8, 0x69, 0xbc, 0x81, 0xf, 0xbb, 0xcb, 0xf0, 0x6d, 0xa8, 0xa0, 0xa0, 0x6b, 0xd7, 0x9a, 0x40, 0x26, 0xa, 0xdb, 0x98, 0x22, 0x88, 0x81, 0xf, 0x92, 0xf2, 0xe7, 0x4f, 0x13, 0x5, 0x0, 0x48, 0x44, 0x44, 0x4c, 0xcc, 0x24, 0xf, 0x8, 0xd, 0xaf, 0xe1, 0x88, 0x96, 0x68, 0x88, 0x2b, 0x71, 0xe3, 0xbc, 0x6b, 0x9e, 0x13, 0x29, 0x91, 0x48, 0xce, 0x66, 0x4a, 0xe0, 0xf0, 0x2, 0x37, 0x5d, 0x88, 0x13, 0x71, 0x4, 0x99, 0xce, 0xe2, 0x34, 0xcf, 0xf3, 0x75, 0xb6, 0xcc, 0xa, 0xd3, 0x1a, 0x18, 0x8b, 0x30, 0x8, 0xa1, 0xda, 0x57, 0x9b, 0xb2, 0x2c, 0xb7, 0x54, 0x5a, 0x94, 0x6f, 0x27, 0xab, 0xc5, 0xaa, 0xa8, 0xf, 0x35, 0x58, 0x6b, 0xc1, 0x7b, 0xdf, 0xdb, 0xac, 0x94, 0x2, 0x44, 0x4, 0xd6, 0x52, 0xb9, 0x23, 0xce, 0x8f, 0x15, 0x1a, 0xdb, 0x80, 0x31, 0xe3, 0xd3, 0xd9, 0x98, 0x35, 0xac, 0x95, 0x55, 0x23, 0x2d, 0x7, 0x8b, 0x87, 0xa6, 0xe, 0x19, 0xc9, 0xea, 0x1, 0xca, 0xb5, 0x15, 0x3f, 0x4e, 0x35, 0x11, 0x1d, 0x1f, 0x58, 0x63, 0xb7, 0xde, 0x87, 0x6, 0x80, 0xcf, 0x8f, 0x6f, 0x1a, 0xc0, 0x77, 0xd, 0x9c, 0x73, 0x93, 0xd, 0x58, 0xdb, 0x85, 0xee, 0x73, 0xfd, 0xcd, 0xa, 0xff, 0x6b, 0x70, 0x7, 0xd6, 0xd5, 0x90, 0x3b, 0x10, 0xe9, 0x51, 0x80, 0x0, 0x0, 0x0, 0x0, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82 -}; - static const unsigned char tab_menu_png[] = { 0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 0x0, 0x0, 0x0, 0xd, 0x49, 0x48, 0x44, 0x52, 0x0, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0x10, 0x8, 0x6, 0x0, 0x0, 0x0, 0x1f, 0xf3, 0xff, 0x61, 0x0, 0x0, 0x0, 0x6, 0x62, 0x4b, 0x47, 0x44, 0x0, 0xff, 0x0, 0xff, 0x0, 0xff, 0xa0, 0xbd, 0xa7, 0x93, 0x0, 0x0, 0x0, 0x6f, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0x63, 0x60, 0x18, 0x5, 0xa3, 0x80, 0x81, 0x81, 0x11, 0x5d, 0xe0, 0xc1, 0x83, 0x7, 0xff, 0xf1, 0x69, 0x50, 0x50, 0x50, 0x40, 0xd1, 0xc3, 0x44, 0xa9, 0xb, 0xa8, 0x6f, 0x0, 0x23, 0x23, 0x63, 0x3c, 0x3, 0x3, 0xc3, 0x57, 0x2c, 0x6a, 0xbf, 0x33, 0x32, 0x32, 0xa6, 0x63, 0xa8, 0xc7, 0x66, 0xea, 0xfd, 0xfb, 0xf7, 0x35, 0x18, 0x18, 0x18, 0x56, 0x31, 0x32, 0x32, 0xea, 0x42, 0x85, 0x6e, 0x30, 0x33, 0x33, 0x87, 0xc9, 0xca, 0xca, 0x5e, 0x26, 0xca, 0x0, 0x6, 0x6, 0x6, 0x86, 0x17, 0x2f, 0x5e, 0x70, 0xff, 0xfc, 0xf9, 0x73, 0xa, 0x3, 0x3, 0x3, 0x3, 0x3b, 0x3b, 0x7b, 0x8e, 0x84, 0x84, 0x4, 0x36, 0x57, 0xd, 0x2, 0x0, 0x0, 0x67, 0xf2, 0x14, 0xc2, 0xc2, 0xbe, 0xf5, 0xb5, 0x0, 0x0, 0x0, 0x0, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82 }; diff --git a/scene/resources/style_box.cpp b/scene/resources/style_box.cpp index 13529c8572d..b665de2de1f 100644 --- a/scene/resources/style_box.cpp +++ b/scene/resources/style_box.cpp @@ -297,6 +297,15 @@ int StyleBoxFlat::get_border_size() const { return border_size; } +void StyleBoxFlat::_set_additional_border_size(Margin p_margin, int p_size) { + additional_border_size[p_margin] = p_size; + emit_changed(); +} + +int StyleBoxFlat::_get_additional_border_size(Margin p_margin) const { + return additional_border_size[p_margin]; +} + void StyleBoxFlat::set_border_blend(bool p_blend) { blend = p_blend; @@ -357,6 +366,12 @@ void StyleBoxFlat::draw(RID p_canvas_item, const Rect2 &p_rect) const { if (draw_center) vs->canvas_item_add_rect(p_canvas_item, Rect2(r.pos, r.size), bg_color); + + Rect2i r_add = p_rect; + vs->canvas_item_add_rect(p_canvas_item, Rect2(Point2i(r_add.pos.x - additional_border_size[MARGIN_LEFT], r_add.pos.y - additional_border_size[MARGIN_TOP]), Size2(r_add.size.width + additional_border_size[MARGIN_LEFT] + additional_border_size[MARGIN_RIGHT], additional_border_size[MARGIN_TOP])), light_color); + vs->canvas_item_add_rect(p_canvas_item, Rect2(Point2i(r_add.pos.x - additional_border_size[MARGIN_LEFT], r_add.pos.y), Size2(additional_border_size[MARGIN_LEFT], r_add.size.height)), light_color); + vs->canvas_item_add_rect(p_canvas_item, Rect2(Point2i(r_add.pos.x + r_add.size.width, r_add.pos.y), Size2(additional_border_size[MARGIN_RIGHT], r_add.size.height)), dark_color); + vs->canvas_item_add_rect(p_canvas_item, Rect2(Point2i(r_add.pos.x - additional_border_size[MARGIN_LEFT], r_add.pos.y + r_add.size.height), Size2(r_add.size.width + additional_border_size[MARGIN_LEFT] + additional_border_size[MARGIN_RIGHT], additional_border_size[MARGIN_BOTTOM])), dark_color); } float StyleBoxFlat::get_style_margin(Margin p_margin) const { @@ -394,6 +409,10 @@ StyleBoxFlat::StyleBoxFlat() { draw_center = true; blend = true; border_size = 0; + additional_border_size[0] = 0; + additional_border_size[1] = 0; + additional_border_size[2] = 0; + additional_border_size[3] = 0; } StyleBoxFlat::~StyleBoxFlat() { } diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h index e14a5368796..bbb2444bd73 100644 --- a/scene/resources/style_box.h +++ b/scene/resources/style_box.h @@ -123,6 +123,7 @@ class StyleBoxFlat : public StyleBox { Color dark_color; int border_size; + int additional_border_size[4]; bool draw_center; bool blend; @@ -143,6 +144,9 @@ public: void set_border_size(int p_size); int get_border_size() const; + void _set_additional_border_size(Margin p_margin, int p_size); + int _get_additional_border_size(Margin p_margin) const; + void set_border_blend(bool p_blend); bool get_border_blend() const;