diff --git a/editor/icons/icon_animated_sprite.svg b/editor/icons/icon_animated_sprite.svg index fe7fde5a39e..6fdf8a7a406 100644 --- a/editor/icons/icon_animated_sprite.svg +++ b/editor/icons/icon_animated_sprite.svg @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/editor/icons/icon_animated_sprite_3d.svg b/editor/icons/icon_animated_sprite_3d.svg index 658ba3e5c21..ccc836832cd 100644 --- a/editor/icons/icon_animated_sprite_3d.svg +++ b/editor/icons/icon_animated_sprite_3d.svg @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/editor/icons/icon_center_container.svg b/editor/icons/icon_center_container.svg index 446e9e0f9ca..fc0abc5c282 100644 --- a/editor/icons/icon_center_container.svg +++ b/editor/icons/icon_center_container.svg @@ -1,5 +1,3 @@ - - - + diff --git a/editor/icons/icon_color_pick.svg b/editor/icons/icon_color_pick.svg index 893afb4eb41..5c21eeba8b6 100644 --- a/editor/icons/icon_color_pick.svg +++ b/editor/icons/icon_color_pick.svg @@ -1,5 +1,5 @@ - + diff --git a/editor/icons/icon_color_picker.svg b/editor/icons/icon_color_picker.svg index 272dfeca483..55c55fe2053 100644 --- a/editor/icons/icon_color_picker.svg +++ b/editor/icons/icon_color_picker.svg @@ -1,5 +1,3 @@ - - - + diff --git a/editor/icons/icon_color_picker_button.svg b/editor/icons/icon_color_picker_button.svg index 5d734a5b201..d8de02b2980 100644 --- a/editor/icons/icon_color_picker_button.svg +++ b/editor/icons/icon_color_picker_button.svg @@ -1,7 +1,3 @@ - - - - - + diff --git a/editor/icons/icon_control_layout.svg b/editor/icons/icon_control_layout.svg new file mode 100644 index 00000000000..4bf60cf7511 --- /dev/null +++ b/editor/icons/icon_control_layout.svg @@ -0,0 +1,3 @@ + + + diff --git a/editor/icons/icon_kinematic_body.svg b/editor/icons/icon_kinematic_body.svg index 393e21a529a..6f8d69fa533 100644 --- a/editor/icons/icon_kinematic_body.svg +++ b/editor/icons/icon_kinematic_body.svg @@ -1,5 +1,5 @@ - + diff --git a/editor/icons/icon_kinematic_body_2d.svg b/editor/icons/icon_kinematic_body_2d.svg index e269efd12a5..51026e5f284 100644 --- a/editor/icons/icon_kinematic_body_2d.svg +++ b/editor/icons/icon_kinematic_body_2d.svg @@ -1,5 +1,7 @@ - + + + diff --git a/editor/icons/icon_shader.svg b/editor/icons/icon_shader.svg new file mode 100644 index 00000000000..659d81519a7 --- /dev/null +++ b/editor/icons/icon_shader.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/editor/icons/icon_sprite.svg b/editor/icons/icon_sprite.svg index 4feea4d265b..09fc2f0979f 100644 --- a/editor/icons/icon_sprite.svg +++ b/editor/icons/icon_sprite.svg @@ -1,5 +1,3 @@ - - - + diff --git a/editor/icons/icon_sprite_3d.svg b/editor/icons/icon_sprite_3d.svg index 0d5caae501e..eb163e3f439 100644 --- a/editor/icons/icon_sprite_3d.svg +++ b/editor/icons/icon_sprite_3d.svg @@ -1,5 +1,5 @@ - - + + diff --git a/editor/icons/icon_sprite_frames.svg b/editor/icons/icon_sprite_frames.svg index e797819892c..8123cbd6b41 100644 --- a/editor/icons/icon_sprite_frames.svg +++ b/editor/icons/icon_sprite_frames.svg @@ -1,5 +1,3 @@ - - - + diff --git a/editor/icons/icon_viewport_sprite.svg b/editor/icons/icon_viewport_sprite.svg deleted file mode 100644 index 4b8bbeaeba4..00000000000 --- a/editor/icons/icon_viewport_sprite.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 4c9b988d7f4..3f64e75bc87 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -2815,6 +2815,7 @@ void CanvasItemEditor::_notification(int p_what) { zoom_reset->set_icon(get_icon("ZoomReset", "EditorIcons")); zoom_plus->set_icon(get_icon("ZoomMore", "EditorIcons")); + presets_menu->set_icon(get_icon("ControlLayout", "EditorIcons")); PopupMenu *p = presets_menu->get_popup(); p->clear(); diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index 6c12b622723..dc7acd9fdca 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -45,7 +45,7 @@ void SpriteFramesEditor::_notification(int p_what) { if (p_what == NOTIFICATION_ENTER_TREE) { load->set_icon(get_icon("Load", "EditorIcons")); _delete->set_icon(get_icon("Remove", "EditorIcons")); - new_anim->set_icon(get_icon("Add", "EditorIcons")); + new_anim->set_icon(get_icon("New", "EditorIcons")); remove_anim->set_icon(get_icon("Remove", "EditorIcons")); } @@ -821,7 +821,7 @@ SpriteFramesEditorPlugin::SpriteFramesEditorPlugin(EditorNode *p_node) { editor = p_node; frames_editor = memnew(SpriteFramesEditor); - frames_editor->set_custom_minimum_size(Size2(0, 300)); + frames_editor->set_custom_minimum_size(Size2(0, 300) * EDSCALE); button = editor->add_bottom_panel_item("SpriteFrames", frames_editor); button->hide(); } diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index 3c1889e8295..3f8d93d9762 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -298,11 +298,11 @@ void EditorSpatialGizmo::add_handles(const Vector &p_handles, bool p_bi } } -void EditorSpatialGizmo::add_solid_box(Ref &p_material, Vector3 size) { +void EditorSpatialGizmo::add_solid_box(Ref &p_material, Vector3 p_size) { ERR_FAIL_COND(!spatial_node); CubeMesh cubem; - cubem.set_size(size); + cubem.set_size(p_size); Ref m = memnew(ArrayMesh); m->add_surface_from_arrays(cubem.surface_get_primitive_type(0), cubem.surface_get_arrays(0)); m->surface_set_material(0, p_material); diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index e58cbe373b1..dbd7c1bbc0b 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -40,12 +40,15 @@ void ColorPicker::_notification(int p_what) { switch (p_what) { case NOTIFICATION_THEME_CHANGED: { //sample->set_texture(get_icon("color_sample")); + btn_pick->set_icon(get_icon("screen_picker", "ColorPicker")); + bt_add_preset->set_icon(get_icon("add_preset")); _update_controls(); } break; case NOTIFICATION_ENTER_TREE: { btn_pick->set_icon(get_icon("screen_picker", "ColorPicker")); + bt_add_preset->set_icon(get_icon("add_preset")); _update_color(); } break; @@ -601,7 +604,6 @@ ColorPicker::ColorPicker() preset->connect("draw", this, "_update_presets"); bt_add_preset = memnew(Button); - bt_add_preset->set_icon(get_icon("add_preset")); bt_add_preset->set_tooltip(TTR("Add current color as a preset")); bt_add_preset->connect("pressed", this, "_add_preset_pressed"); bbc->add_child(bt_add_preset); diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 0d3cccc2b5e..946a8c47a3d 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -284,7 +284,6 @@ void GraphEdit::_notification(int p_what) { zoom_reset->set_icon(get_icon("reset")); zoom_plus->set_icon(get_icon("more")); snap_button->set_icon(get_icon("snap")); - //zoom_icon->set_texture( get_icon("Zoom", "EditorIcons")); } if (p_what == NOTIFICATION_DRAW) { diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 402e06f6211..ce439fece66 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -884,7 +884,7 @@ void fill_default_theme(Ref &theme, const Ref &default_font, const theme->set_icon("minus", "GraphEdit", make_icon(icon_zoom_less_png)); theme->set_icon("reset", "GraphEdit", make_icon(icon_zoom_reset_png)); theme->set_icon("more", "GraphEdit", make_icon(icon_zoom_more_png)); - theme->set_icon("SnapGrid", "GraphEdit", make_icon(icon_snap_grid_png)); + theme->set_icon("snap", "GraphEdit", make_icon(icon_snap_grid_png)); theme->set_stylebox("bg", "GraphEdit", make_stylebox(tree_bg_png, 4, 4, 4, 5)); theme->set_color("grid_minor", "GraphEdit", Color(1, 1, 1, 0.05)); theme->set_color("grid_major", "GraphEdit", Color(1, 1, 1, 0.2));