From af045e568d6c5eecb10563d2aa3df7e3ea258488 Mon Sep 17 00:00:00 2001 From: Yuri Sizov Date: Fri, 28 Jan 2022 16:16:28 +0300 Subject: [PATCH 1/4] Remove unnecessary transformations from editor icons --- editor/icons/BoxMesh.svg | 2 +- editor/icons/BoxShape3D.svg | 2 +- editor/icons/Callable.svg | 2 +- editor/icons/ImmediateMesh.svg | 2 +- editor/icons/NavigationAgent2D.svg | 2 +- editor/icons/NavigationAgent3D.svg | 2 +- editor/icons/NavigationObstacle2D.svg | 2 +- editor/icons/NavigationObstacle3D.svg | 2 +- editor/icons/ReverseGradient.svg | 2 +- editor/icons/Ruler.svg | 2 +- editor/icons/Texture3D.svg | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/editor/icons/BoxMesh.svg b/editor/icons/BoxMesh.svg index 6809b989cc3..ef2f77a2554 100644 --- a/editor/icons/BoxMesh.svg +++ b/editor/icons/BoxMesh.svg @@ -1 +1 @@ - + diff --git a/editor/icons/BoxShape3D.svg b/editor/icons/BoxShape3D.svg index f9012d1fe4b..eb191ea7a06 100644 --- a/editor/icons/BoxShape3D.svg +++ b/editor/icons/BoxShape3D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/Callable.svg b/editor/icons/Callable.svg index d689f1a4c49..3f0d33a06c1 100644 --- a/editor/icons/Callable.svg +++ b/editor/icons/Callable.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ImmediateMesh.svg b/editor/icons/ImmediateMesh.svg index 9521530876f..f94ef8c323e 100644 --- a/editor/icons/ImmediateMesh.svg +++ b/editor/icons/ImmediateMesh.svg @@ -1 +1 @@ - + diff --git a/editor/icons/NavigationAgent2D.svg b/editor/icons/NavigationAgent2D.svg index 28760be4a16..3f1d571a7e2 100644 --- a/editor/icons/NavigationAgent2D.svg +++ b/editor/icons/NavigationAgent2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/NavigationAgent3D.svg b/editor/icons/NavigationAgent3D.svg index da76adaa991..947b2129c39 100644 --- a/editor/icons/NavigationAgent3D.svg +++ b/editor/icons/NavigationAgent3D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/NavigationObstacle2D.svg b/editor/icons/NavigationObstacle2D.svg index fab41e2f43e..8fcb5617dd1 100644 --- a/editor/icons/NavigationObstacle2D.svg +++ b/editor/icons/NavigationObstacle2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/NavigationObstacle3D.svg b/editor/icons/NavigationObstacle3D.svg index 10b09107cd8..c5e58eebf70 100644 --- a/editor/icons/NavigationObstacle3D.svg +++ b/editor/icons/NavigationObstacle3D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ReverseGradient.svg b/editor/icons/ReverseGradient.svg index 12f80d12dde..07d127cb576 100644 --- a/editor/icons/ReverseGradient.svg +++ b/editor/icons/ReverseGradient.svg @@ -1 +1 @@ - + diff --git a/editor/icons/Ruler.svg b/editor/icons/Ruler.svg index 2f026ed365b..caf2f7f15cd 100644 --- a/editor/icons/Ruler.svg +++ b/editor/icons/Ruler.svg @@ -1 +1 @@ - + diff --git a/editor/icons/Texture3D.svg b/editor/icons/Texture3D.svg index 795dd62ba57..a313613b266 100644 --- a/editor/icons/Texture3D.svg +++ b/editor/icons/Texture3D.svg @@ -1 +1 @@ - + From 49eddd22e0780e6458bc43b6356c462237681f80 Mon Sep 17 00:00:00 2001 From: Yuri Sizov Date: Fri, 28 Jan 2022 19:38:48 +0300 Subject: [PATCH 2/4] Update icons and color conversion rules to simplify the palette --- editor/editor_themes.cpp | 66 ++++++++++++++----- editor/icons/AudioBusLayout.svg | 2 +- editor/icons/AudioListener2D.svg | 2 +- editor/icons/AudioStreamMP3.svg | 2 +- editor/icons/AudioStreamOGGVorbis.svg | 2 +- editor/icons/AudioStreamPlayer.svg | 2 +- editor/icons/AudioStreamPlayer2D.svg | 2 +- editor/icons/AudioStreamPlayer3D.svg | 2 +- editor/icons/AudioStreamSample.svg | 2 +- editor/icons/BoxShape3D.svg | 2 +- editor/icons/Breakpoint.svg | 2 +- editor/icons/BusVuEmpty.svg | 2 +- editor/icons/BusVuFull.svg | 2 +- editor/icons/CPUParticles2D.svg | 2 +- editor/icons/CanvasGroup.svg | 2 +- editor/icons/CanvasModulate.svg | 2 +- editor/icons/CapsuleShape2D.svg | 2 +- editor/icons/CapsuleShape3D.svg | 2 +- editor/icons/CircleShape2D.svg | 2 +- editor/icons/CodeEdit.svg | 2 +- editor/icons/ColorRect.svg | 2 +- editor/icons/ConcavePolygonShape2D.svg | 2 +- editor/icons/ConcavePolygonShape3D.svg | 2 +- editor/icons/ConvexPolygonShape2D.svg | 2 +- editor/icons/ConvexPolygonShape3D.svg | 2 +- editor/icons/CurveClose.svg | 2 +- editor/icons/CurveCreate.svg | 2 +- editor/icons/CurveCurve.svg | 2 +- editor/icons/CurveDelete.svg | 2 +- editor/icons/CurveEdit.svg | 2 +- editor/icons/CylinderShape3D.svg | 2 +- editor/icons/DebugSkipBreakpointsOff.svg | 2 +- editor/icons/DebugSkipBreakpointsOn.svg | 2 +- editor/icons/Decal.svg | 2 +- editor/icons/DirectionalLight2D.svg | 2 +- editor/icons/EditorBoneHandle.svg | 2 +- editor/icons/EditorControlAnchor.svg | 2 +- editor/icons/EditorCurveHandle.svg | 2 +- editor/icons/EditorPathSharpHandle.svg | 2 +- editor/icons/EditorPathSmoothHandle.svg | 2 +- editor/icons/EditorPositionPrevious.svg | 2 +- editor/icons/EditorPositionUnselected.svg | 2 +- editor/icons/Error.svg | 2 +- editor/icons/ErrorWarning.svg | 2 +- editor/icons/FileBroken.svg | 2 +- editor/icons/FileBrokenBigThumb.svg | 2 +- editor/icons/FileDead.svg | 2 +- editor/icons/FileDeadBigThumb.svg | 2 +- editor/icons/FileDeadMediumThumb.svg | 2 +- editor/icons/GizmoCPUParticles3D.svg | 2 +- editor/icons/GizmoDirectionalLight.svg | 2 +- editor/icons/GizmoLight.svg | 2 +- editor/icons/GizmoSpotLight.svg | 2 +- editor/icons/GraphEdit.svg | 2 +- editor/icons/GraphNode.svg | 2 +- editor/icons/GuiDropdown.svg | 2 +- editor/icons/GuiScrollGrabber.svg | 2 +- editor/icons/GuiScrollGrabberHl.svg | 2 +- editor/icons/GuiScrollGrabberPressed.svg | 2 +- editor/icons/GuiSliderGrabber.svg | 2 +- editor/icons/GuiSliderGrabberHl.svg | 2 +- editor/icons/GuiToggleOn.svg | 2 +- editor/icons/GuiToggleOnMirrored.svg | 2 +- editor/icons/GuiTreeArrowDown.svg | 2 +- editor/icons/GuiTreeArrowLeft.svg | 2 +- editor/icons/GuiTreeArrowRight.svg | 2 +- editor/icons/GuiTreeUpdown.svg | 2 +- editor/icons/HFlowContainer.svg | 2 +- editor/icons/Heart.svg | 2 +- editor/icons/HeightMapShape3D.svg | 2 +- editor/icons/Help.svg | 2 +- editor/icons/ImportCheck.svg | 2 +- editor/icons/ImportFail.svg | 2 +- editor/icons/KeyBlendShape.svg | 45 +------------ editor/icons/KeyInvalid.svg | 2 +- editor/icons/KeyTrackBlendShape.svg | 46 +------------ editor/icons/KeyTrackPosition.svg | 48 +------------- editor/icons/KeyTrackRotation.svg | 48 +------------- editor/icons/KeyTrackScale.svg | 48 +------------- editor/icons/KeyXPosition.svg | 44 +------------ editor/icons/KeyXRotation.svg | 45 +------------ editor/icons/KeyXScale.svg | 45 +------------ editor/icons/MaterialPreviewCube.svg | 2 +- editor/icons/MaterialPreviewCubeOff.svg | 2 +- editor/icons/NodeDisabled.svg | 2 +- editor/icons/OccluderPolygon2D.svg | 2 +- editor/icons/OverbrightIndicator.svg | 2 +- editor/icons/PackedByteArray.svg | 2 +- editor/icons/PackedColorArray.svg | 2 +- editor/icons/PageFirst.svg | 48 +------------- editor/icons/PageLast.svg | 48 +------------- editor/icons/PageNext.svg | 43 +----------- editor/icons/PagePrevious.svg | 43 +----------- editor/icons/ParallaxBackground.svg | 2 +- editor/icons/ParallaxLayer.svg | 2 +- editor/icons/PlayOverlay.svg | 2 +- editor/icons/RectangleShape2D.svg | 2 +- editor/icons/ReverseGradient.svg | 2 +- editor/icons/Script.svg | 2 +- editor/icons/ScriptCreate.svg | 2 +- editor/icons/ScriptExtend.svg | 2 +- editor/icons/ScriptRemove.svg | 2 +- editor/icons/SegmentShape2D.svg | 2 +- editor/icons/SeparationRayShape2D.svg | 2 +- editor/icons/ShapeCast2D.svg | 2 +- editor/icons/SphereShape3D.svg | 2 +- editor/icons/StaticBody2D.svg | 2 +- editor/icons/StatusError.svg | 2 +- editor/icons/StatusSuccess.svg | 2 +- editor/icons/TerrainMatchCorners.svg | 2 +- editor/icons/TerrainMatchCornersAndSides.svg | 2 +- editor/icons/TerrainMatchSides.svg | 2 +- editor/icons/TextEdit.svg | 2 +- editor/icons/TimelineIndicator.svg | 2 +- editor/icons/ToolTriangle.svg | 2 +- editor/icons/TransitionEndAutoBig.svg | 2 +- editor/icons/TransitionEndBig.svg | 2 +- editor/icons/TransitionImmediateAutoBig.svg | 2 +- editor/icons/TransitionImmediateBig.svg | 2 +- editor/icons/TransitionSyncAutoBig.svg | 2 +- editor/icons/TransitionSyncBig.svg | 2 +- editor/icons/VFlowContainer.svg | 2 +- .../icons/VisualShaderGraphTextureUniform.svg | 2 +- .../icons/VisualShaderNodeColorConstant.svg | 2 +- editor/icons/VisualShaderNodeColorOp.svg | 2 +- editor/icons/VisualShaderNodeColorUniform.svg | 2 +- editor/icons/VisualShaderNodeCurveTexture.svg | 2 +- .../icons/VisualShaderNodeCurveXYZTexture.svg | 2 +- editor/icons/VisualShaderNodeExpression.svg | 2 +- editor/icons/VisualShaderNodeInput.svg | 2 +- .../VisualShaderNodeTexture2DArrayUniform.svg | 2 +- .../VisualShaderNodeTexture3DUniform.svg | 2 +- .../icons/VisualShaderNodeTextureUniform.svg | 2 +- ...isualShaderNodeTextureUniformTriplanar.svg | 2 +- .../VisualShaderNodeTransformCompose.svg | 2 +- .../VisualShaderNodeTransformDecompose.svg | 2 +- .../VisualShaderNodeTransformVecMult.svg | 2 +- editor/icons/VisualShaderNodeVec3Uniform.svg | 2 +- .../icons/VisualShaderNodeVectorCompose.svg | 2 +- .../icons/VisualShaderNodeVectorDecompose.svg | 2 +- .../icons/VisualShaderNodeVectorDistance.svg | 2 +- editor/icons/VisualShaderNodeVectorFunc.svg | 2 +- editor/icons/VisualShaderNodeVectorLen.svg | 2 +- editor/icons/WorldBoundaryShape2D.svg | 2 +- modules/visual_script/icons/VisualScript.svg | 2 +- .../icons/VisualScriptInternal.svg | 2 +- 146 files changed, 196 insertions(+), 687 deletions(-) diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index db4161fc3d9..4315e6be0ba 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -150,11 +150,25 @@ void editor_register_and_generate_icons(Ref p_theme, bool p_dark_theme = // are contained in the dictionary above. Set exceptions; + // Some of the colors below are listed for completeness sake. + // This can be a basis for proper palette validation later. if (!p_dark_theme) { // Convert color: FROM TO + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#478cbf", "#478cbf"); // Godot Blue + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#414042", "#414042"); // Godot Gray + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#e0e0e0", "#5a5a5a"); // Common icon color - ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ffffff", "#414141"); // White - ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#b4b4b4", "#363636"); // Script darker color + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ffffff", "#414141"); // Pure white + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#000000", "#bfbfbf"); // Pure black + // Keep pure RGB colors as is, but list them for explicity. + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ff0000", "#ff0000"); // Pure red + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#00ff00", "#00ff00"); // Pure green + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#0000ff", "#0000ff"); // Pure blue + + // GUI Colors + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#808080", "#808080"); // GUI disabled color + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#b3b3b3", "#363636"); // GUI disabled light color + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#699ce8", "#699ce8"); // GUI highlight color ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#f9f9f9", "#606060"); // Scrollbar grabber highlight color ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#c38ef1", "#a85de9"); // Animation @@ -162,7 +176,10 @@ void editor_register_and_generate_icons(Ref p_theme, bool p_dark_theme = ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#8da5f3", "#3d64dd"); // 2D ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#4b70ea", "#1a3eac"); // 2D Dark ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#8eef97", "#2fa139"); // Control - ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ffdd65", "#ca8a04"); // Node warning + + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#5fb2ff", "#0079f0"); // Selection (blue) + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#003e7a", "#2b74bb"); // Selection (darker blue) + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#f7f5cf", "#615f3a"); // Gizmo (yellow) // Rainbow ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ff4545", "#ff2929"); // Red @@ -173,31 +190,45 @@ void editor_register_and_generate_icons(Ref p_theme, bool p_dark_theme = ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#8045ff", "#702aff"); // Purple ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ff4596", "#ff2781"); // Pink - // Audio gradient - // Red is defined further below. + // Audio gradients ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#e1da5b", "#d6cf4b"); // Yellow - ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#5fff97", "#00f010"); // Green + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#62aeff", "#1678e0"); // Frozen gradient top + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#75d1e6", "#41acc5"); // Frozen gradient middle + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#84ffee", "#49ccba"); // Frozen gradient bottom + + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#f70000", "#c91616"); // Color track red + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#eec315", "#d58c0b"); // Color track orange + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#dbee15", "#b7d10a"); // Color track yellow + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#288027", "#218309"); // Color track green + + // Resource groups ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ffca5f", "#fea900"); // Mesh resource (orange) - ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#0787ff", "#68b6ff"); // Shape resource (blue) - - ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ff5f5f", "#ff3333"); // Red audio gradient + remove (red) - ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#5fff97", "#00db50"); // Add (green) - ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#5fb2ff", "#5caeff"); // Selection (blue) + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#2998ff", "#68b6ff"); // Shape resource (blue) + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#a2d2ff", "#4998e3"); // Shape resource (light blue) // Animation editor tracks // The property track icon color is set by the common icon color. - ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ea7940", "#bd5e2c"); // 3D Transform track + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ea7940", "#bd5e2c"); // 3D Position track + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ff2b88", "#bd165f"); // 3D Rotation track + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#eac840", "#bd9d1f"); // 3D Scale track ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#3cf34e", "#16a827"); // Call Method track ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#2877f6", "#236be6"); // Bezier Curve track ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#eae440", "#9f9722"); // Audio Playback track ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#a448f0", "#9853ce"); // Animation Playback track + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#5ad5c4", "#0a9c88"); // Blend Shape track + + // Control layouts + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#d6d6d6", "#474747"); // Highlighted part + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#474747", "#d6d6d6"); // Background part + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#919191", "#6e6e6e"); // Border part // TileSet editor icons ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#fce00e", "#aa8d24"); // New Single Tile ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#0e71fc", "#0350bd"); // New Autotile ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#c6ced4", "#828f9b"); // New Atlas + // Visual script ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#41ecad", "#25e3a0"); // VisualScript variant ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#6f91f0", "#6d8eeb"); // VisualScript bool ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#5abbef", "#4fb2e9"); // VisualScript int @@ -216,6 +247,11 @@ void editor_register_and_generate_icons(Ref p_theme, bool p_dark_theme = ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#41ec80", "#2ce573"); // VisualScript RID ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#55f3e3", "#12d5c3"); // VisualScript Object ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#54ed9e", "#57e99f"); // VisualScript Dictionary + // Visual shaders + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#77ce57", "#67c046"); // Vector funcs + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ea686c", "#d95256"); // Vector transforms + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#eac968", "#d9b64f"); // Textures and cubemaps + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#cf68ea", "#c050dd"); // Functions and expressions exceptions.insert("EditorPivot"); exceptions.insert("EditorHandle"); @@ -246,9 +282,9 @@ void editor_register_and_generate_icons(Ref p_theme, bool p_dark_theme = const Color error_color = p_theme->get_color("error_color", "Editor"); const Color success_color = p_theme->get_color("success_color", "Editor"); const Color warning_color = p_theme->get_color("warning_color", "Editor"); - dark_icon_color_dictionary[Color::html("#ff0000")] = error_color; - dark_icon_color_dictionary[Color::html("#45ff8b")] = success_color; - dark_icon_color_dictionary[Color::html("#dbab09")] = warning_color; + dark_icon_color_dictionary[Color::html("#ff5f5f")] = error_color; + dark_icon_color_dictionary[Color::html("#5fff97")] = success_color; + dark_icon_color_dictionary[Color::html("#ffdd65")] = warning_color; // Generate icons. if (!p_only_thumbs) { diff --git a/editor/icons/AudioBusLayout.svg b/editor/icons/AudioBusLayout.svg index 9928f369e7e..c3bbc882e43 100644 --- a/editor/icons/AudioBusLayout.svg +++ b/editor/icons/AudioBusLayout.svg @@ -1 +1 @@ - + diff --git a/editor/icons/AudioListener2D.svg b/editor/icons/AudioListener2D.svg index db84dcfed70..91674602909 100644 --- a/editor/icons/AudioListener2D.svg +++ b/editor/icons/AudioListener2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/AudioStreamMP3.svg b/editor/icons/AudioStreamMP3.svg index dc034c90de1..2e54de9faa3 100644 --- a/editor/icons/AudioStreamMP3.svg +++ b/editor/icons/AudioStreamMP3.svg @@ -1 +1 @@ - + diff --git a/editor/icons/AudioStreamOGGVorbis.svg b/editor/icons/AudioStreamOGGVorbis.svg index dc034c90de1..2e54de9faa3 100644 --- a/editor/icons/AudioStreamOGGVorbis.svg +++ b/editor/icons/AudioStreamOGGVorbis.svg @@ -1 +1 @@ - + diff --git a/editor/icons/AudioStreamPlayer.svg b/editor/icons/AudioStreamPlayer.svg index 6d074c07443..31bd847e37a 100644 --- a/editor/icons/AudioStreamPlayer.svg +++ b/editor/icons/AudioStreamPlayer.svg @@ -1 +1 @@ - + diff --git a/editor/icons/AudioStreamPlayer2D.svg b/editor/icons/AudioStreamPlayer2D.svg index 0bf091de298..716680f215b 100644 --- a/editor/icons/AudioStreamPlayer2D.svg +++ b/editor/icons/AudioStreamPlayer2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/AudioStreamPlayer3D.svg b/editor/icons/AudioStreamPlayer3D.svg index ebe3128a21e..d89dacd5881 100644 --- a/editor/icons/AudioStreamPlayer3D.svg +++ b/editor/icons/AudioStreamPlayer3D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/AudioStreamSample.svg b/editor/icons/AudioStreamSample.svg index dc034c90de1..2e54de9faa3 100644 --- a/editor/icons/AudioStreamSample.svg +++ b/editor/icons/AudioStreamSample.svg @@ -1 +1 @@ - + diff --git a/editor/icons/BoxShape3D.svg b/editor/icons/BoxShape3D.svg index eb191ea7a06..a16f0bb1e10 100644 --- a/editor/icons/BoxShape3D.svg +++ b/editor/icons/BoxShape3D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/Breakpoint.svg b/editor/icons/Breakpoint.svg index b95c2b511ed..12ff4097e6d 100644 --- a/editor/icons/Breakpoint.svg +++ b/editor/icons/Breakpoint.svg @@ -1 +1 @@ - + diff --git a/editor/icons/BusVuEmpty.svg b/editor/icons/BusVuEmpty.svg index cc72e7cd36f..88a14bc3eea 100644 --- a/editor/icons/BusVuEmpty.svg +++ b/editor/icons/BusVuEmpty.svg @@ -1 +1 @@ - + diff --git a/editor/icons/BusVuFull.svg b/editor/icons/BusVuFull.svg index 34396c3c186..0bc00971c0a 100644 --- a/editor/icons/BusVuFull.svg +++ b/editor/icons/BusVuFull.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CPUParticles2D.svg b/editor/icons/CPUParticles2D.svg index 29770bc2404..2a2c6169540 100644 --- a/editor/icons/CPUParticles2D.svg +++ b/editor/icons/CPUParticles2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CanvasGroup.svg b/editor/icons/CanvasGroup.svg index 232ae532310..110fcbd2054 100644 --- a/editor/icons/CanvasGroup.svg +++ b/editor/icons/CanvasGroup.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CanvasModulate.svg b/editor/icons/CanvasModulate.svg index a96fb75643c..86cb7ef64c1 100644 --- a/editor/icons/CanvasModulate.svg +++ b/editor/icons/CanvasModulate.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CapsuleShape2D.svg b/editor/icons/CapsuleShape2D.svg index 99a67d4641e..5b3c411f9b0 100644 --- a/editor/icons/CapsuleShape2D.svg +++ b/editor/icons/CapsuleShape2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CapsuleShape3D.svg b/editor/icons/CapsuleShape3D.svg index 4d5bc522b18..c566d68f19c 100644 --- a/editor/icons/CapsuleShape3D.svg +++ b/editor/icons/CapsuleShape3D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CircleShape2D.svg b/editor/icons/CircleShape2D.svg index d23ca6d8a38..37a0903a0ca 100644 --- a/editor/icons/CircleShape2D.svg +++ b/editor/icons/CircleShape2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CodeEdit.svg b/editor/icons/CodeEdit.svg index 7f08340ffbe..8461c739b48 100644 --- a/editor/icons/CodeEdit.svg +++ b/editor/icons/CodeEdit.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ColorRect.svg b/editor/icons/ColorRect.svg index f08b17ed1f4..e69591104f1 100644 --- a/editor/icons/ColorRect.svg +++ b/editor/icons/ColorRect.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ConcavePolygonShape2D.svg b/editor/icons/ConcavePolygonShape2D.svg index 463fece525a..26eda843a8c 100644 --- a/editor/icons/ConcavePolygonShape2D.svg +++ b/editor/icons/ConcavePolygonShape2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ConcavePolygonShape3D.svg b/editor/icons/ConcavePolygonShape3D.svg index 60d1a6234fb..67631ec0e71 100644 --- a/editor/icons/ConcavePolygonShape3D.svg +++ b/editor/icons/ConcavePolygonShape3D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ConvexPolygonShape2D.svg b/editor/icons/ConvexPolygonShape2D.svg index dc2b0faf819..fa5369aace5 100644 --- a/editor/icons/ConvexPolygonShape2D.svg +++ b/editor/icons/ConvexPolygonShape2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ConvexPolygonShape3D.svg b/editor/icons/ConvexPolygonShape3D.svg index 3478289ab1c..f0c9101c72e 100644 --- a/editor/icons/ConvexPolygonShape3D.svg +++ b/editor/icons/ConvexPolygonShape3D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CurveClose.svg b/editor/icons/CurveClose.svg index 5cb8ab890e3..032f1c6c556 100644 --- a/editor/icons/CurveClose.svg +++ b/editor/icons/CurveClose.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CurveCreate.svg b/editor/icons/CurveCreate.svg index 1e80817a347..4e406b35f62 100644 --- a/editor/icons/CurveCreate.svg +++ b/editor/icons/CurveCreate.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CurveCurve.svg b/editor/icons/CurveCurve.svg index e43e7ccd8a4..b5312aea24d 100644 --- a/editor/icons/CurveCurve.svg +++ b/editor/icons/CurveCurve.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CurveDelete.svg b/editor/icons/CurveDelete.svg index cf15d75bc13..1c8f5e2aaea 100644 --- a/editor/icons/CurveDelete.svg +++ b/editor/icons/CurveDelete.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CurveEdit.svg b/editor/icons/CurveEdit.svg index 57e365f3cd9..d8318a6bc37 100644 --- a/editor/icons/CurveEdit.svg +++ b/editor/icons/CurveEdit.svg @@ -1 +1 @@ - + diff --git a/editor/icons/CylinderShape3D.svg b/editor/icons/CylinderShape3D.svg index cbff4c88970..1283097848c 100644 --- a/editor/icons/CylinderShape3D.svg +++ b/editor/icons/CylinderShape3D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/DebugSkipBreakpointsOff.svg b/editor/icons/DebugSkipBreakpointsOff.svg index e7228c599f7..aef0d45a059 100644 --- a/editor/icons/DebugSkipBreakpointsOff.svg +++ b/editor/icons/DebugSkipBreakpointsOff.svg @@ -1 +1 @@ - + diff --git a/editor/icons/DebugSkipBreakpointsOn.svg b/editor/icons/DebugSkipBreakpointsOn.svg index 0836954bbbf..d8fbc6e43a6 100644 --- a/editor/icons/DebugSkipBreakpointsOn.svg +++ b/editor/icons/DebugSkipBreakpointsOn.svg @@ -1 +1 @@ - + diff --git a/editor/icons/Decal.svg b/editor/icons/Decal.svg index 8c33f44360e..d1f362bb260 100644 --- a/editor/icons/Decal.svg +++ b/editor/icons/Decal.svg @@ -1 +1 @@ - + diff --git a/editor/icons/DirectionalLight2D.svg b/editor/icons/DirectionalLight2D.svg index f30702b5028..bc611a71bd4 100644 --- a/editor/icons/DirectionalLight2D.svg +++ b/editor/icons/DirectionalLight2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/EditorBoneHandle.svg b/editor/icons/EditorBoneHandle.svg index a6d7c3f8788..378c2ea8c17 100644 --- a/editor/icons/EditorBoneHandle.svg +++ b/editor/icons/EditorBoneHandle.svg @@ -1 +1 @@ - + diff --git a/editor/icons/EditorControlAnchor.svg b/editor/icons/EditorControlAnchor.svg index 3383ea121ff..a638ee8d000 100644 --- a/editor/icons/EditorControlAnchor.svg +++ b/editor/icons/EditorControlAnchor.svg @@ -1 +1 @@ - + diff --git a/editor/icons/EditorCurveHandle.svg b/editor/icons/EditorCurveHandle.svg index e0f32568074..e57d6b5dbb7 100644 --- a/editor/icons/EditorCurveHandle.svg +++ b/editor/icons/EditorCurveHandle.svg @@ -1 +1 @@ - + diff --git a/editor/icons/EditorPathSharpHandle.svg b/editor/icons/EditorPathSharpHandle.svg index 5166930cca2..1bdf32df572 100644 --- a/editor/icons/EditorPathSharpHandle.svg +++ b/editor/icons/EditorPathSharpHandle.svg @@ -1 +1 @@ - + diff --git a/editor/icons/EditorPathSmoothHandle.svg b/editor/icons/EditorPathSmoothHandle.svg index 2ab4f3a96ac..d4bd434020f 100644 --- a/editor/icons/EditorPathSmoothHandle.svg +++ b/editor/icons/EditorPathSmoothHandle.svg @@ -1 +1 @@ - + diff --git a/editor/icons/EditorPositionPrevious.svg b/editor/icons/EditorPositionPrevious.svg index ba69650d817..159a4c01676 100644 --- a/editor/icons/EditorPositionPrevious.svg +++ b/editor/icons/EditorPositionPrevious.svg @@ -1 +1 @@ - + diff --git a/editor/icons/EditorPositionUnselected.svg b/editor/icons/EditorPositionUnselected.svg index 881fcab0790..30aaa776593 100644 --- a/editor/icons/EditorPositionUnselected.svg +++ b/editor/icons/EditorPositionUnselected.svg @@ -1 +1 @@ - + diff --git a/editor/icons/Error.svg b/editor/icons/Error.svg index 4b306ae1cad..8478decb41e 100644 --- a/editor/icons/Error.svg +++ b/editor/icons/Error.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ErrorWarning.svg b/editor/icons/ErrorWarning.svg index 53b7be2763f..e034bf194f5 100644 --- a/editor/icons/ErrorWarning.svg +++ b/editor/icons/ErrorWarning.svg @@ -1 +1 @@ - + diff --git a/editor/icons/FileBroken.svg b/editor/icons/FileBroken.svg index 2f5099aa29c..d68c89e2409 100644 --- a/editor/icons/FileBroken.svg +++ b/editor/icons/FileBroken.svg @@ -1 +1 @@ - + diff --git a/editor/icons/FileBrokenBigThumb.svg b/editor/icons/FileBrokenBigThumb.svg index effaa0afe95..7dc5a14452d 100644 --- a/editor/icons/FileBrokenBigThumb.svg +++ b/editor/icons/FileBrokenBigThumb.svg @@ -1 +1 @@ - + diff --git a/editor/icons/FileDead.svg b/editor/icons/FileDead.svg index f8df831a22b..b5c18f37801 100644 --- a/editor/icons/FileDead.svg +++ b/editor/icons/FileDead.svg @@ -1 +1 @@ - + diff --git a/editor/icons/FileDeadBigThumb.svg b/editor/icons/FileDeadBigThumb.svg index ca4578e7b72..0c1e3e03c67 100644 --- a/editor/icons/FileDeadBigThumb.svg +++ b/editor/icons/FileDeadBigThumb.svg @@ -1 +1 @@ - + diff --git a/editor/icons/FileDeadMediumThumb.svg b/editor/icons/FileDeadMediumThumb.svg index 2d1808b90a7..6ca43c89038 100644 --- a/editor/icons/FileDeadMediumThumb.svg +++ b/editor/icons/FileDeadMediumThumb.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GizmoCPUParticles3D.svg b/editor/icons/GizmoCPUParticles3D.svg index 785cd81625a..e62dd530c46 100644 --- a/editor/icons/GizmoCPUParticles3D.svg +++ b/editor/icons/GizmoCPUParticles3D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GizmoDirectionalLight.svg b/editor/icons/GizmoDirectionalLight.svg index 041a6947735..d943be79f0a 100644 --- a/editor/icons/GizmoDirectionalLight.svg +++ b/editor/icons/GizmoDirectionalLight.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GizmoLight.svg b/editor/icons/GizmoLight.svg index ab828c800ef..0f74ebbd3d7 100644 --- a/editor/icons/GizmoLight.svg +++ b/editor/icons/GizmoLight.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GizmoSpotLight.svg b/editor/icons/GizmoSpotLight.svg index 18696c2cdc2..d1a576ce229 100644 --- a/editor/icons/GizmoSpotLight.svg +++ b/editor/icons/GizmoSpotLight.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GraphEdit.svg b/editor/icons/GraphEdit.svg index fbe7422f981..071c1915324 100644 --- a/editor/icons/GraphEdit.svg +++ b/editor/icons/GraphEdit.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GraphNode.svg b/editor/icons/GraphNode.svg index 061a81d9512..b56fe6b6090 100644 --- a/editor/icons/GraphNode.svg +++ b/editor/icons/GraphNode.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GuiDropdown.svg b/editor/icons/GuiDropdown.svg index ef37cda6ff1..9b9abe5b494 100644 --- a/editor/icons/GuiDropdown.svg +++ b/editor/icons/GuiDropdown.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GuiScrollGrabber.svg b/editor/icons/GuiScrollGrabber.svg index 935f9361dd8..a8a0cf08c21 100644 --- a/editor/icons/GuiScrollGrabber.svg +++ b/editor/icons/GuiScrollGrabber.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GuiScrollGrabberHl.svg b/editor/icons/GuiScrollGrabberHl.svg index cec53330f01..0388063d25c 100644 --- a/editor/icons/GuiScrollGrabberHl.svg +++ b/editor/icons/GuiScrollGrabberHl.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GuiScrollGrabberPressed.svg b/editor/icons/GuiScrollGrabberPressed.svg index 13f8427d35c..202b9c94122 100644 --- a/editor/icons/GuiScrollGrabberPressed.svg +++ b/editor/icons/GuiScrollGrabberPressed.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GuiSliderGrabber.svg b/editor/icons/GuiSliderGrabber.svg index ddd1b1d9b81..47342747bfc 100644 --- a/editor/icons/GuiSliderGrabber.svg +++ b/editor/icons/GuiSliderGrabber.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GuiSliderGrabberHl.svg b/editor/icons/GuiSliderGrabberHl.svg index 3af977ae4ac..b7be27af0f6 100644 --- a/editor/icons/GuiSliderGrabberHl.svg +++ b/editor/icons/GuiSliderGrabberHl.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GuiToggleOn.svg b/editor/icons/GuiToggleOn.svg index 37b47e8de49..0e20128730d 100644 --- a/editor/icons/GuiToggleOn.svg +++ b/editor/icons/GuiToggleOn.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GuiToggleOnMirrored.svg b/editor/icons/GuiToggleOnMirrored.svg index fa7f602ee7c..affbb5c7a8c 100644 --- a/editor/icons/GuiToggleOnMirrored.svg +++ b/editor/icons/GuiToggleOnMirrored.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GuiTreeArrowDown.svg b/editor/icons/GuiTreeArrowDown.svg index 7b320152ff6..ad8a625f18f 100644 --- a/editor/icons/GuiTreeArrowDown.svg +++ b/editor/icons/GuiTreeArrowDown.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GuiTreeArrowLeft.svg b/editor/icons/GuiTreeArrowLeft.svg index d0f7b36fab9..2cc20c8459f 100644 --- a/editor/icons/GuiTreeArrowLeft.svg +++ b/editor/icons/GuiTreeArrowLeft.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GuiTreeArrowRight.svg b/editor/icons/GuiTreeArrowRight.svg index cf1b5dac7cb..14314bb3652 100644 --- a/editor/icons/GuiTreeArrowRight.svg +++ b/editor/icons/GuiTreeArrowRight.svg @@ -1 +1 @@ - + diff --git a/editor/icons/GuiTreeUpdown.svg b/editor/icons/GuiTreeUpdown.svg index c6b9014e827..feff99f618f 100644 --- a/editor/icons/GuiTreeUpdown.svg +++ b/editor/icons/GuiTreeUpdown.svg @@ -1 +1 @@ - + diff --git a/editor/icons/HFlowContainer.svg b/editor/icons/HFlowContainer.svg index 0ab03f686e9..dedf6e54f2a 100644 --- a/editor/icons/HFlowContainer.svg +++ b/editor/icons/HFlowContainer.svg @@ -1 +1 @@ - + diff --git a/editor/icons/Heart.svg b/editor/icons/Heart.svg index 4f46908760f..00edf907291 100644 --- a/editor/icons/Heart.svg +++ b/editor/icons/Heart.svg @@ -1 +1 @@ - + diff --git a/editor/icons/HeightMapShape3D.svg b/editor/icons/HeightMapShape3D.svg index 0ffff968505..e1b3af88e59 100644 --- a/editor/icons/HeightMapShape3D.svg +++ b/editor/icons/HeightMapShape3D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/Help.svg b/editor/icons/Help.svg index 65f3100164e..ace4e79bf3b 100644 --- a/editor/icons/Help.svg +++ b/editor/icons/Help.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ImportCheck.svg b/editor/icons/ImportCheck.svg index 0e6b0a7105b..d17506afeaa 100644 --- a/editor/icons/ImportCheck.svg +++ b/editor/icons/ImportCheck.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ImportFail.svg b/editor/icons/ImportFail.svg index 6e34dfc4057..582b2446143 100644 --- a/editor/icons/ImportFail.svg +++ b/editor/icons/ImportFail.svg @@ -1 +1 @@ - + diff --git a/editor/icons/KeyBlendShape.svg b/editor/icons/KeyBlendShape.svg index 42f73419422..11932bd8479 100644 --- a/editor/icons/KeyBlendShape.svg +++ b/editor/icons/KeyBlendShape.svg @@ -1,44 +1 @@ - - - - - - + diff --git a/editor/icons/KeyInvalid.svg b/editor/icons/KeyInvalid.svg index 4a04c1ee659..4cfc72dc3fe 100644 --- a/editor/icons/KeyInvalid.svg +++ b/editor/icons/KeyInvalid.svg @@ -1 +1 @@ - + diff --git a/editor/icons/KeyTrackBlendShape.svg b/editor/icons/KeyTrackBlendShape.svg index e82f0d6a6f7..2594fad3d36 100644 --- a/editor/icons/KeyTrackBlendShape.svg +++ b/editor/icons/KeyTrackBlendShape.svg @@ -1,45 +1 @@ - - - - - - - + diff --git a/editor/icons/KeyTrackPosition.svg b/editor/icons/KeyTrackPosition.svg index 05c6e888418..300b0439e5d 100644 --- a/editor/icons/KeyTrackPosition.svg +++ b/editor/icons/KeyTrackPosition.svg @@ -1,47 +1 @@ - - - - - - - + diff --git a/editor/icons/KeyTrackRotation.svg b/editor/icons/KeyTrackRotation.svg index d05e381eb24..cfaa9ef80bb 100644 --- a/editor/icons/KeyTrackRotation.svg +++ b/editor/icons/KeyTrackRotation.svg @@ -1,47 +1 @@ - - - - - - - + diff --git a/editor/icons/KeyTrackScale.svg b/editor/icons/KeyTrackScale.svg index 9269ccbca2a..73fe1cb5f07 100644 --- a/editor/icons/KeyTrackScale.svg +++ b/editor/icons/KeyTrackScale.svg @@ -1,47 +1 @@ - - - - - - - + diff --git a/editor/icons/KeyXPosition.svg b/editor/icons/KeyXPosition.svg index 5816a241c93..59c14cd8207 100644 --- a/editor/icons/KeyXPosition.svg +++ b/editor/icons/KeyXPosition.svg @@ -1,43 +1 @@ - - - - - - + diff --git a/editor/icons/KeyXRotation.svg b/editor/icons/KeyXRotation.svg index 6cd5a67ac0e..4494c301bb5 100644 --- a/editor/icons/KeyXRotation.svg +++ b/editor/icons/KeyXRotation.svg @@ -1,44 +1 @@ - - - - - - + diff --git a/editor/icons/KeyXScale.svg b/editor/icons/KeyXScale.svg index 588fa5d2f34..cb6011cd83c 100644 --- a/editor/icons/KeyXScale.svg +++ b/editor/icons/KeyXScale.svg @@ -1,44 +1 @@ - - - - - - + diff --git a/editor/icons/MaterialPreviewCube.svg b/editor/icons/MaterialPreviewCube.svg index 29baa9f0303..c4af05ffb00 100644 --- a/editor/icons/MaterialPreviewCube.svg +++ b/editor/icons/MaterialPreviewCube.svg @@ -1 +1 @@ - + diff --git a/editor/icons/MaterialPreviewCubeOff.svg b/editor/icons/MaterialPreviewCubeOff.svg index 14564c558ea..e573e170ada 100644 --- a/editor/icons/MaterialPreviewCubeOff.svg +++ b/editor/icons/MaterialPreviewCubeOff.svg @@ -1 +1 @@ - + diff --git a/editor/icons/NodeDisabled.svg b/editor/icons/NodeDisabled.svg index b2d51fc4fb0..f0cc586103a 100644 --- a/editor/icons/NodeDisabled.svg +++ b/editor/icons/NodeDisabled.svg @@ -1 +1 @@ - + diff --git a/editor/icons/OccluderPolygon2D.svg b/editor/icons/OccluderPolygon2D.svg index ae5d2f4a1d5..7ab4240d2f8 100644 --- a/editor/icons/OccluderPolygon2D.svg +++ b/editor/icons/OccluderPolygon2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/OverbrightIndicator.svg b/editor/icons/OverbrightIndicator.svg index f618980d51e..35ad59fbfb4 100644 --- a/editor/icons/OverbrightIndicator.svg +++ b/editor/icons/OverbrightIndicator.svg @@ -1 +1 @@ - + diff --git a/editor/icons/PackedByteArray.svg b/editor/icons/PackedByteArray.svg index 95534e44105..448e25c478d 100644 --- a/editor/icons/PackedByteArray.svg +++ b/editor/icons/PackedByteArray.svg @@ -1 +1 @@ - + diff --git a/editor/icons/PackedColorArray.svg b/editor/icons/PackedColorArray.svg index 588002f1887..6911ff1d349 100644 --- a/editor/icons/PackedColorArray.svg +++ b/editor/icons/PackedColorArray.svg @@ -1 +1 @@ - + diff --git a/editor/icons/PageFirst.svg b/editor/icons/PageFirst.svg index 76078691ef8..ab5cd2c7891 100644 --- a/editor/icons/PageFirst.svg +++ b/editor/icons/PageFirst.svg @@ -1,47 +1 @@ - - - - - - - - - + diff --git a/editor/icons/PageLast.svg b/editor/icons/PageLast.svg index 17c874e8c90..0bc8504e118 100644 --- a/editor/icons/PageLast.svg +++ b/editor/icons/PageLast.svg @@ -1,47 +1 @@ - - - - - - - - - + diff --git a/editor/icons/PageNext.svg b/editor/icons/PageNext.svg index 89ff6219bb2..2c3d032d63b 100644 --- a/editor/icons/PageNext.svg +++ b/editor/icons/PageNext.svg @@ -1,42 +1 @@ - - - - - - - - + diff --git a/editor/icons/PagePrevious.svg b/editor/icons/PagePrevious.svg index a2fa84da0cb..37adc85d7af 100644 --- a/editor/icons/PagePrevious.svg +++ b/editor/icons/PagePrevious.svg @@ -1,42 +1 @@ - - - - - - - - + diff --git a/editor/icons/ParallaxBackground.svg b/editor/icons/ParallaxBackground.svg index 9d13f3a65d8..f188230fcc4 100644 --- a/editor/icons/ParallaxBackground.svg +++ b/editor/icons/ParallaxBackground.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ParallaxLayer.svg b/editor/icons/ParallaxLayer.svg index 0768e941ad7..58968b77fb6 100644 --- a/editor/icons/ParallaxLayer.svg +++ b/editor/icons/ParallaxLayer.svg @@ -1 +1 @@ - + diff --git a/editor/icons/PlayOverlay.svg b/editor/icons/PlayOverlay.svg index 9b3299d1b94..9ff59b1170d 100644 --- a/editor/icons/PlayOverlay.svg +++ b/editor/icons/PlayOverlay.svg @@ -1 +1 @@ - + diff --git a/editor/icons/RectangleShape2D.svg b/editor/icons/RectangleShape2D.svg index f0d6c54dc9a..2d6a5032556 100644 --- a/editor/icons/RectangleShape2D.svg +++ b/editor/icons/RectangleShape2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ReverseGradient.svg b/editor/icons/ReverseGradient.svg index 07d127cb576..55bc5a16781 100644 --- a/editor/icons/ReverseGradient.svg +++ b/editor/icons/ReverseGradient.svg @@ -1 +1 @@ - + diff --git a/editor/icons/Script.svg b/editor/icons/Script.svg index 2a47c67def0..997a4b5e061 100644 --- a/editor/icons/Script.svg +++ b/editor/icons/Script.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ScriptCreate.svg b/editor/icons/ScriptCreate.svg index 564dcddc2ed..70e13e14c46 100644 --- a/editor/icons/ScriptCreate.svg +++ b/editor/icons/ScriptCreate.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ScriptExtend.svg b/editor/icons/ScriptExtend.svg index 5aa39e21a95..96291e8aa20 100644 --- a/editor/icons/ScriptExtend.svg +++ b/editor/icons/ScriptExtend.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ScriptRemove.svg b/editor/icons/ScriptRemove.svg index 9af184c946b..392d38e06d2 100644 --- a/editor/icons/ScriptRemove.svg +++ b/editor/icons/ScriptRemove.svg @@ -1 +1 @@ - + diff --git a/editor/icons/SegmentShape2D.svg b/editor/icons/SegmentShape2D.svg index 3fcbd786255..b6763f74295 100644 --- a/editor/icons/SegmentShape2D.svg +++ b/editor/icons/SegmentShape2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/SeparationRayShape2D.svg b/editor/icons/SeparationRayShape2D.svg index aa8cee1210c..6966e75bc65 100644 --- a/editor/icons/SeparationRayShape2D.svg +++ b/editor/icons/SeparationRayShape2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ShapeCast2D.svg b/editor/icons/ShapeCast2D.svg index dcdba92f456..36065705b08 100644 --- a/editor/icons/ShapeCast2D.svg +++ b/editor/icons/ShapeCast2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/SphereShape3D.svg b/editor/icons/SphereShape3D.svg index cc526abcec2..6aceee5864e 100644 --- a/editor/icons/SphereShape3D.svg +++ b/editor/icons/SphereShape3D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/StaticBody2D.svg b/editor/icons/StaticBody2D.svg index ba61605522f..359d4d858ce 100644 --- a/editor/icons/StaticBody2D.svg +++ b/editor/icons/StaticBody2D.svg @@ -1 +1 @@ - + diff --git a/editor/icons/StatusError.svg b/editor/icons/StatusError.svg index a9639c87494..278d77d8bf1 100644 --- a/editor/icons/StatusError.svg +++ b/editor/icons/StatusError.svg @@ -1 +1 @@ - + diff --git a/editor/icons/StatusSuccess.svg b/editor/icons/StatusSuccess.svg index 6e7988100f6..d8a05fc3292 100644 --- a/editor/icons/StatusSuccess.svg +++ b/editor/icons/StatusSuccess.svg @@ -1 +1 @@ - + diff --git a/editor/icons/TerrainMatchCorners.svg b/editor/icons/TerrainMatchCorners.svg index b9dfcf67d21..0d5cfe710c9 100644 --- a/editor/icons/TerrainMatchCorners.svg +++ b/editor/icons/TerrainMatchCorners.svg @@ -1 +1 @@ - + diff --git a/editor/icons/TerrainMatchCornersAndSides.svg b/editor/icons/TerrainMatchCornersAndSides.svg index 81153005bdb..a54ad8fd7c3 100644 --- a/editor/icons/TerrainMatchCornersAndSides.svg +++ b/editor/icons/TerrainMatchCornersAndSides.svg @@ -1 +1 @@ - + diff --git a/editor/icons/TerrainMatchSides.svg b/editor/icons/TerrainMatchSides.svg index 1e2ec75ea78..ca3ec872fa0 100644 --- a/editor/icons/TerrainMatchSides.svg +++ b/editor/icons/TerrainMatchSides.svg @@ -1 +1 @@ - + diff --git a/editor/icons/TextEdit.svg b/editor/icons/TextEdit.svg index 67a51453733..a749c17c91a 100644 --- a/editor/icons/TextEdit.svg +++ b/editor/icons/TextEdit.svg @@ -1 +1 @@ - + diff --git a/editor/icons/TimelineIndicator.svg b/editor/icons/TimelineIndicator.svg index d63026b9e27..3f89206814a 100644 --- a/editor/icons/TimelineIndicator.svg +++ b/editor/icons/TimelineIndicator.svg @@ -1 +1 @@ - + diff --git a/editor/icons/ToolTriangle.svg b/editor/icons/ToolTriangle.svg index 51dee03f60d..a682e8a36bb 100644 --- a/editor/icons/ToolTriangle.svg +++ b/editor/icons/ToolTriangle.svg @@ -1 +1 @@ - + diff --git a/editor/icons/TransitionEndAutoBig.svg b/editor/icons/TransitionEndAutoBig.svg index 22f3414d343..97774d7d6dd 100644 --- a/editor/icons/TransitionEndAutoBig.svg +++ b/editor/icons/TransitionEndAutoBig.svg @@ -1 +1 @@ - + diff --git a/editor/icons/TransitionEndBig.svg b/editor/icons/TransitionEndBig.svg index 641f9c55d01..6cfcf44bf0e 100644 --- a/editor/icons/TransitionEndBig.svg +++ b/editor/icons/TransitionEndBig.svg @@ -1 +1 @@ - + diff --git a/editor/icons/TransitionImmediateAutoBig.svg b/editor/icons/TransitionImmediateAutoBig.svg index fe5e0903b5b..36a49621eb1 100644 --- a/editor/icons/TransitionImmediateAutoBig.svg +++ b/editor/icons/TransitionImmediateAutoBig.svg @@ -1 +1 @@ - + diff --git a/editor/icons/TransitionImmediateBig.svg b/editor/icons/TransitionImmediateBig.svg index 2365518cc38..aa79e634571 100644 --- a/editor/icons/TransitionImmediateBig.svg +++ b/editor/icons/TransitionImmediateBig.svg @@ -1 +1 @@ - + diff --git a/editor/icons/TransitionSyncAutoBig.svg b/editor/icons/TransitionSyncAutoBig.svg index 27cb6376671..440d4c47702 100644 --- a/editor/icons/TransitionSyncAutoBig.svg +++ b/editor/icons/TransitionSyncAutoBig.svg @@ -1 +1 @@ - + diff --git a/editor/icons/TransitionSyncBig.svg b/editor/icons/TransitionSyncBig.svg index 27ae5197397..c6ef188e988 100644 --- a/editor/icons/TransitionSyncBig.svg +++ b/editor/icons/TransitionSyncBig.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VFlowContainer.svg b/editor/icons/VFlowContainer.svg index 9023bf22455..ccb0bea883b 100644 --- a/editor/icons/VFlowContainer.svg +++ b/editor/icons/VFlowContainer.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderGraphTextureUniform.svg b/editor/icons/VisualShaderGraphTextureUniform.svg index ed9e084fd3a..c95a72601fc 100644 --- a/editor/icons/VisualShaderGraphTextureUniform.svg +++ b/editor/icons/VisualShaderGraphTextureUniform.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeColorConstant.svg b/editor/icons/VisualShaderNodeColorConstant.svg index cbc5b3a4717..d327012a1fe 100644 --- a/editor/icons/VisualShaderNodeColorConstant.svg +++ b/editor/icons/VisualShaderNodeColorConstant.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeColorOp.svg b/editor/icons/VisualShaderNodeColorOp.svg index 7b6cd8149ba..005da8b6e17 100644 --- a/editor/icons/VisualShaderNodeColorOp.svg +++ b/editor/icons/VisualShaderNodeColorOp.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeColorUniform.svg b/editor/icons/VisualShaderNodeColorUniform.svg index ce89b165837..db41e5eca3a 100644 --- a/editor/icons/VisualShaderNodeColorUniform.svg +++ b/editor/icons/VisualShaderNodeColorUniform.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeCurveTexture.svg b/editor/icons/VisualShaderNodeCurveTexture.svg index c0ee634ca47..e468acf8ca2 100644 --- a/editor/icons/VisualShaderNodeCurveTexture.svg +++ b/editor/icons/VisualShaderNodeCurveTexture.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeCurveXYZTexture.svg b/editor/icons/VisualShaderNodeCurveXYZTexture.svg index c0ee634ca47..e468acf8ca2 100644 --- a/editor/icons/VisualShaderNodeCurveXYZTexture.svg +++ b/editor/icons/VisualShaderNodeCurveXYZTexture.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeExpression.svg b/editor/icons/VisualShaderNodeExpression.svg index 8a930d40782..710ba818b7b 100644 --- a/editor/icons/VisualShaderNodeExpression.svg +++ b/editor/icons/VisualShaderNodeExpression.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeInput.svg b/editor/icons/VisualShaderNodeInput.svg index ec347100d75..0c4de2e681b 100644 --- a/editor/icons/VisualShaderNodeInput.svg +++ b/editor/icons/VisualShaderNodeInput.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeTexture2DArrayUniform.svg b/editor/icons/VisualShaderNodeTexture2DArrayUniform.svg index ed9e084fd3a..c95a72601fc 100644 --- a/editor/icons/VisualShaderNodeTexture2DArrayUniform.svg +++ b/editor/icons/VisualShaderNodeTexture2DArrayUniform.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeTexture3DUniform.svg b/editor/icons/VisualShaderNodeTexture3DUniform.svg index ed9e084fd3a..c95a72601fc 100644 --- a/editor/icons/VisualShaderNodeTexture3DUniform.svg +++ b/editor/icons/VisualShaderNodeTexture3DUniform.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeTextureUniform.svg b/editor/icons/VisualShaderNodeTextureUniform.svg index ed9e084fd3a..c95a72601fc 100644 --- a/editor/icons/VisualShaderNodeTextureUniform.svg +++ b/editor/icons/VisualShaderNodeTextureUniform.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeTextureUniformTriplanar.svg b/editor/icons/VisualShaderNodeTextureUniformTriplanar.svg index ed9e084fd3a..c95a72601fc 100644 --- a/editor/icons/VisualShaderNodeTextureUniformTriplanar.svg +++ b/editor/icons/VisualShaderNodeTextureUniformTriplanar.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeTransformCompose.svg b/editor/icons/VisualShaderNodeTransformCompose.svg index 6c7b28cda32..774f9e77b1d 100644 --- a/editor/icons/VisualShaderNodeTransformCompose.svg +++ b/editor/icons/VisualShaderNodeTransformCompose.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeTransformDecompose.svg b/editor/icons/VisualShaderNodeTransformDecompose.svg index 276b3ea7c8d..9594bcb2638 100644 --- a/editor/icons/VisualShaderNodeTransformDecompose.svg +++ b/editor/icons/VisualShaderNodeTransformDecompose.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeTransformVecMult.svg b/editor/icons/VisualShaderNodeTransformVecMult.svg index fe133b6ffee..611f027402d 100644 --- a/editor/icons/VisualShaderNodeTransformVecMult.svg +++ b/editor/icons/VisualShaderNodeTransformVecMult.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeVec3Uniform.svg b/editor/icons/VisualShaderNodeVec3Uniform.svg index 6e0175230c9..eed10289c06 100644 --- a/editor/icons/VisualShaderNodeVec3Uniform.svg +++ b/editor/icons/VisualShaderNodeVec3Uniform.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeVectorCompose.svg b/editor/icons/VisualShaderNodeVectorCompose.svg index 8e12ab2ff63..2c4c1fb8b97 100644 --- a/editor/icons/VisualShaderNodeVectorCompose.svg +++ b/editor/icons/VisualShaderNodeVectorCompose.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeVectorDecompose.svg b/editor/icons/VisualShaderNodeVectorDecompose.svg index 4bd2dc21388..5fb8661300a 100644 --- a/editor/icons/VisualShaderNodeVectorDecompose.svg +++ b/editor/icons/VisualShaderNodeVectorDecompose.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeVectorDistance.svg b/editor/icons/VisualShaderNodeVectorDistance.svg index 74a46047bf8..b7185f25fb3 100644 --- a/editor/icons/VisualShaderNodeVectorDistance.svg +++ b/editor/icons/VisualShaderNodeVectorDistance.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeVectorFunc.svg b/editor/icons/VisualShaderNodeVectorFunc.svg index dcd4cee3e48..e452bc3d498 100644 --- a/editor/icons/VisualShaderNodeVectorFunc.svg +++ b/editor/icons/VisualShaderNodeVectorFunc.svg @@ -1 +1 @@ - + diff --git a/editor/icons/VisualShaderNodeVectorLen.svg b/editor/icons/VisualShaderNodeVectorLen.svg index 71faffdc3fe..dce48909277 100644 --- a/editor/icons/VisualShaderNodeVectorLen.svg +++ b/editor/icons/VisualShaderNodeVectorLen.svg @@ -1 +1 @@ - + diff --git a/editor/icons/WorldBoundaryShape2D.svg b/editor/icons/WorldBoundaryShape2D.svg index f1dbe97c6f7..70defbebd8b 100644 --- a/editor/icons/WorldBoundaryShape2D.svg +++ b/editor/icons/WorldBoundaryShape2D.svg @@ -1 +1 @@ - + diff --git a/modules/visual_script/icons/VisualScript.svg b/modules/visual_script/icons/VisualScript.svg index 2352ba5d872..bc698247c98 100644 --- a/modules/visual_script/icons/VisualScript.svg +++ b/modules/visual_script/icons/VisualScript.svg @@ -1 +1 @@ - + diff --git a/modules/visual_script/icons/VisualScriptInternal.svg b/modules/visual_script/icons/VisualScriptInternal.svg index ea83047a294..8ab39ad929f 100644 --- a/modules/visual_script/icons/VisualScriptInternal.svg +++ b/modules/visual_script/icons/VisualScriptInternal.svg @@ -1 +1 @@ - + From 36ff66c62f156a6c9f5c046f039023517e95f72e Mon Sep 17 00:00:00 2001 From: Yuri Sizov Date: Fri, 28 Jan 2022 19:55:16 +0300 Subject: [PATCH 3/4] Fix the breakpoint icon in CodeEdit --- editor/editor_themes.cpp | 3 ++- editor/icons/Breakpoint.svg | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 4315e6be0ba..238df4a8aa7 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -157,7 +157,6 @@ void editor_register_and_generate_icons(Ref p_theme, bool p_dark_theme = ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#478cbf", "#478cbf"); // Godot Blue ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#414042", "#414042"); // Godot Gray - ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#e0e0e0", "#5a5a5a"); // Common icon color ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#ffffff", "#414141"); // Pure white ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#000000", "#bfbfbf"); // Pure black // Keep pure RGB colors as is, but list them for explicity. @@ -166,6 +165,8 @@ void editor_register_and_generate_icons(Ref p_theme, bool p_dark_theme = ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#0000ff", "#0000ff"); // Pure blue // GUI Colors + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#e0e0e0", "#5a5a5a"); // Common icon color + ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#fefefe", "#fefefe"); // Forced light color ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#808080", "#808080"); // GUI disabled color ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#b3b3b3", "#363636"); // GUI disabled light color ADD_CONVERT_COLOR(dark_icon_color_dictionary, "#699ce8", "#699ce8"); // GUI highlight color diff --git a/editor/icons/Breakpoint.svg b/editor/icons/Breakpoint.svg index 12ff4097e6d..60d59b66c8b 100644 --- a/editor/icons/Breakpoint.svg +++ b/editor/icons/Breakpoint.svg @@ -1 +1 @@ - + From 876345191f871d3e7e5f36934be4d07e8b69f805 Mon Sep 17 00:00:00 2001 From: Yuri Sizov Date: Fri, 28 Jan 2022 20:21:50 +0300 Subject: [PATCH 4/4] Fix theme application in various curve editors --- editor/plugins/abstract_polygon_2d_editor.cpp | 9 +++-- editor/plugins/path_2d_editor_plugin.cpp | 25 +++++++------ editor/plugins/path_3d_editor_plugin.cpp | 35 ++++++++++++++----- editor/plugins/path_3d_editor_plugin.h | 2 ++ editor/plugins/tiles/tile_data_editors.cpp | 17 ++++----- 5 files changed, 55 insertions(+), 33 deletions(-) diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp index 348ef4ecc7f..c6bde4c98a2 100644 --- a/editor/plugins/abstract_polygon_2d_editor.cpp +++ b/editor/plugins/abstract_polygon_2d_editor.cpp @@ -147,12 +147,15 @@ void AbstractPolygon2DEditor::_menu_option(int p_option) { void AbstractPolygon2DEditor::_notification(int p_what) { switch (p_what) { + case NOTIFICATION_ENTER_TREE: + case NOTIFICATION_THEME_CHANGED: { + button_create->set_icon(get_theme_icon(SNAME("CurveCreate"), SNAME("EditorIcons"))); + button_edit->set_icon(get_theme_icon(SNAME("CurveEdit"), SNAME("EditorIcons"))); + button_delete->set_icon(get_theme_icon(SNAME("CurveDelete"), SNAME("EditorIcons"))); + } break; case NOTIFICATION_READY: { disable_polygon_editing(false, String()); - button_create->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveCreate"), SNAME("EditorIcons"))); - button_edit->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveEdit"), SNAME("EditorIcons"))); - button_delete->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveDelete"), SNAME("EditorIcons"))); button_edit->set_pressed(true); get_tree()->connect("node_removed", callable_mp(this, &AbstractPolygon2DEditor::_node_removed)); diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp index c50673559cc..702bc4a8ced 100644 --- a/editor/plugins/path_2d_editor_plugin.cpp +++ b/editor/plugins/path_2d_editor_plugin.cpp @@ -38,14 +38,13 @@ void Path2DEditor::_notification(int p_what) { switch (p_what) { - case NOTIFICATION_READY: { - //button_create->set_icon( get_icon("Edit","EditorIcons")); - //button_edit->set_icon( get_icon("MovePoint","EditorIcons")); - //set_pressed_button(button_edit); - //button_edit->set_pressed(true); - - } break; - case NOTIFICATION_PHYSICS_PROCESS: { + case NOTIFICATION_ENTER_TREE: + case NOTIFICATION_THEME_CHANGED: { + curve_edit->set_icon(get_theme_icon(SNAME("CurveEdit"), SNAME("EditorIcons"))); + curve_edit_curve->set_icon(get_theme_icon(SNAME("CurveCurve"), SNAME("EditorIcons"))); + curve_create->set_icon(get_theme_icon(SNAME("CurveCreate"), SNAME("EditorIcons"))); + curve_del->set_icon(get_theme_icon(SNAME("CurveDelete"), SNAME("EditorIcons"))); + curve_close->set_icon(get_theme_icon(SNAME("CurveClose"), SNAME("EditorIcons"))); } break; } } @@ -532,41 +531,41 @@ Path2DEditor::Path2DEditor(EditorNode *p_editor) { sep = memnew(VSeparator); base_hb->add_child(sep); + curve_edit = memnew(Button); curve_edit->set_flat(true); - curve_edit->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveEdit"), SNAME("EditorIcons"))); curve_edit->set_toggle_mode(true); curve_edit->set_focus_mode(Control::FOCUS_NONE); curve_edit->set_tooltip(TTR("Select Points") + "\n" + TTR("Shift+Drag: Select Control Points") + "\n" + keycode_get_string((Key)KeyModifierMask::CMD) + TTR("Click: Add Point") + "\n" + TTR("Left Click: Split Segment (in curve)") + "\n" + TTR("Right Click: Delete Point")); curve_edit->connect("pressed", callable_mp(this, &Path2DEditor::_mode_selected), varray(MODE_EDIT)); base_hb->add_child(curve_edit); + curve_edit_curve = memnew(Button); curve_edit_curve->set_flat(true); - curve_edit_curve->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveCurve"), SNAME("EditorIcons"))); curve_edit_curve->set_toggle_mode(true); curve_edit_curve->set_focus_mode(Control::FOCUS_NONE); curve_edit_curve->set_tooltip(TTR("Select Control Points (Shift+Drag)")); curve_edit_curve->connect("pressed", callable_mp(this, &Path2DEditor::_mode_selected), varray(MODE_EDIT_CURVE)); base_hb->add_child(curve_edit_curve); + curve_create = memnew(Button); curve_create->set_flat(true); - curve_create->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveCreate"), SNAME("EditorIcons"))); curve_create->set_toggle_mode(true); curve_create->set_focus_mode(Control::FOCUS_NONE); curve_create->set_tooltip(TTR("Add Point (in empty space)")); curve_create->connect("pressed", callable_mp(this, &Path2DEditor::_mode_selected), varray(MODE_CREATE)); base_hb->add_child(curve_create); + curve_del = memnew(Button); curve_del->set_flat(true); - curve_del->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveDelete"), SNAME("EditorIcons"))); curve_del->set_toggle_mode(true); curve_del->set_focus_mode(Control::FOCUS_NONE); curve_del->set_tooltip(TTR("Delete Point")); curve_del->connect("pressed", callable_mp(this, &Path2DEditor::_mode_selected), varray(MODE_DELETE)); base_hb->add_child(curve_del); + curve_close = memnew(Button); curve_close->set_flat(true); - curve_close->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveClose"), SNAME("EditorIcons"))); curve_close->set_focus_mode(Control::FOCUS_NONE); curve_close->set_tooltip(TTR("Close Curve")); curve_close->connect("pressed", callable_mp(this, &Path2DEditor::_mode_selected), varray(ACTION_CLOSE)); diff --git a/editor/plugins/path_3d_editor_plugin.cpp b/editor/plugins/path_3d_editor_plugin.cpp index cb62dcdccc6..7cc926f06ca 100644 --- a/editor/plugins/path_3d_editor_plugin.cpp +++ b/editor/plugins/path_3d_editor_plugin.cpp @@ -539,12 +539,29 @@ void Path3DEditorPlugin::_handle_option_pressed(int p_option) { } } +void Path3DEditorPlugin::_update_theme() { + // TODO: Split the EditorPlugin instance from the UI instance and connect this properly. + // See the 2D path editor for inspiration. + curve_edit->set_icon(Node3DEditor::get_singleton()->get_theme_icon(SNAME("CurveEdit"), SNAME("EditorIcons"))); + curve_create->set_icon(Node3DEditor::get_singleton()->get_theme_icon(SNAME("CurveCreate"), SNAME("EditorIcons"))); + curve_del->set_icon(Node3DEditor::get_singleton()->get_theme_icon(SNAME("CurveDelete"), SNAME("EditorIcons"))); + curve_close->set_icon(Node3DEditor::get_singleton()->get_theme_icon(SNAME("CurveClose"), SNAME("EditorIcons"))); +} + void Path3DEditorPlugin::_notification(int p_what) { - if (p_what == NOTIFICATION_ENTER_TREE) { - curve_create->connect("pressed", callable_mp(this, &Path3DEditorPlugin::_mode_changed), make_binds(0)); - curve_edit->connect("pressed", callable_mp(this, &Path3DEditorPlugin::_mode_changed), make_binds(1)); - curve_del->connect("pressed", callable_mp(this, &Path3DEditorPlugin::_mode_changed), make_binds(2)); - curve_close->connect("pressed", callable_mp(this, &Path3DEditorPlugin::_close_curve)); + switch (p_what) { + case NOTIFICATION_ENTER_TREE: { + curve_create->connect("pressed", callable_mp(this, &Path3DEditorPlugin::_mode_changed), make_binds(0)); + curve_edit->connect("pressed", callable_mp(this, &Path3DEditorPlugin::_mode_changed), make_binds(1)); + curve_del->connect("pressed", callable_mp(this, &Path3DEditorPlugin::_mode_changed), make_binds(2)); + curve_close->connect("pressed", callable_mp(this, &Path3DEditorPlugin::_close_curve)); + + _update_theme(); + } break; + + case NOTIFICATION_READY: { + Node3DEditor::get_singleton()->connect("theme_changed", callable_mp(this, &Path3DEditorPlugin::_update_theme)); + } break; } } @@ -567,33 +584,33 @@ Path3DEditorPlugin::Path3DEditorPlugin(EditorNode *p_node) { sep = memnew(VSeparator); sep->hide(); Node3DEditor::get_singleton()->add_control_to_menu_panel(sep); + curve_edit = memnew(Button); curve_edit->set_flat(true); - curve_edit->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveEdit"), SNAME("EditorIcons"))); curve_edit->set_toggle_mode(true); curve_edit->hide(); curve_edit->set_focus_mode(Control::FOCUS_NONE); curve_edit->set_tooltip(TTR("Select Points") + "\n" + TTR("Shift+Drag: Select Control Points") + "\n" + keycode_get_string((Key)KeyModifierMask::CMD) + TTR("Click: Add Point") + "\n" + TTR("Right Click: Delete Point")); Node3DEditor::get_singleton()->add_control_to_menu_panel(curve_edit); + curve_create = memnew(Button); curve_create->set_flat(true); - curve_create->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveCreate"), SNAME("EditorIcons"))); curve_create->set_toggle_mode(true); curve_create->hide(); curve_create->set_focus_mode(Control::FOCUS_NONE); curve_create->set_tooltip(TTR("Add Point (in empty space)") + "\n" + TTR("Split Segment (in curve)")); Node3DEditor::get_singleton()->add_control_to_menu_panel(curve_create); + curve_del = memnew(Button); curve_del->set_flat(true); - curve_del->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveDelete"), SNAME("EditorIcons"))); curve_del->set_toggle_mode(true); curve_del->hide(); curve_del->set_focus_mode(Control::FOCUS_NONE); curve_del->set_tooltip(TTR("Delete Point")); Node3DEditor::get_singleton()->add_control_to_menu_panel(curve_del); + curve_close = memnew(Button); curve_close->set_flat(true); - curve_close->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveClose"), SNAME("EditorIcons"))); curve_close->hide(); curve_close->set_focus_mode(Control::FOCUS_NONE); curve_close->set_tooltip(TTR("Close Curve")); diff --git a/editor/plugins/path_3d_editor_plugin.h b/editor/plugins/path_3d_editor_plugin.h index adda6488687..b877e2ae17f 100644 --- a/editor/plugins/path_3d_editor_plugin.h +++ b/editor/plugins/path_3d_editor_plugin.h @@ -80,6 +80,8 @@ class Path3DEditorPlugin : public EditorPlugin { Path3D *path; + void _update_theme(); + void _mode_changed(int p_idx); void _close_curve(); void _handle_option_pressed(int p_option); diff --git a/editor/plugins/tiles/tile_data_editors.cpp b/editor/plugins/tiles/tile_data_editors.cpp index d5c2051f315..ede1220da66 100644 --- a/editor/plugins/tiles/tile_data_editors.cpp +++ b/editor/plugins/tiles/tile_data_editors.cpp @@ -713,20 +713,21 @@ void GenericTilePolygonEditor::set_multiple_polygon_mode(bool p_multiple_polygon void GenericTilePolygonEditor::_notification(int p_what) { switch (p_what) { - case NOTIFICATION_READY: - button_create->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveCreate"), SNAME("EditorIcons"))); - button_edit->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveEdit"), SNAME("EditorIcons"))); - button_delete->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveDelete"), SNAME("EditorIcons"))); - button_center_view->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CenterView"), SNAME("EditorIcons"))); - button_pixel_snap->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Snap"), SNAME("EditorIcons"))); - button_advanced_menu->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("GuiTabMenuHl"), SNAME("EditorIcons"))); + case NOTIFICATION_ENTER_TREE: + case NOTIFICATION_THEME_CHANGED: { + button_create->set_icon(get_theme_icon(SNAME("CurveCreate"), SNAME("EditorIcons"))); + button_edit->set_icon(get_theme_icon(SNAME("CurveEdit"), SNAME("EditorIcons"))); + button_delete->set_icon(get_theme_icon(SNAME("CurveDelete"), SNAME("EditorIcons"))); + button_center_view->set_icon(get_theme_icon(SNAME("CenterView"), SNAME("EditorIcons"))); + button_pixel_snap->set_icon(get_theme_icon(SNAME("Snap"), SNAME("EditorIcons"))); + button_advanced_menu->set_icon(get_theme_icon(SNAME("GuiTabMenuHl"), SNAME("EditorIcons"))); PopupMenu *p = button_advanced_menu->get_popup(); p->set_item_icon(p->get_item_index(ROTATE_RIGHT), get_theme_icon(SNAME("RotateRight"), SNAME("EditorIcons"))); p->set_item_icon(p->get_item_index(ROTATE_LEFT), get_theme_icon(SNAME("RotateLeft"), SNAME("EditorIcons"))); p->set_item_icon(p->get_item_index(FLIP_HORIZONTALLY), get_theme_icon(SNAME("MirrorX"), SNAME("EditorIcons"))); p->set_item_icon(p->get_item_index(FLIP_VERTICALLY), get_theme_icon(SNAME("MirrorY"), SNAME("EditorIcons"))); - break; + } break; } }