From 072c893c241a11961a8e5ae67efcb79afdccc223 Mon Sep 17 00:00:00 2001
From: LMW <williamchange@gmail.com>
Date: Fri, 1 Aug 2025 19:11:03 +0800
Subject: [PATCH 1/2] Add button to reset tones levels

---
 material_maker/nodes/tones/tones.gd          |  8 +++
 material_maker/nodes/tones/tones.tscn        | 18 ++++-
 material_maker/theme/default_theme_icons.svg | 71 ++++++++++++++++++--
 3 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/material_maker/nodes/tones/tones.gd b/material_maker/nodes/tones/tones.gd
index 915cffd8d..5e46b497e 100644
--- a/material_maker/nodes/tones/tones.gd
+++ b/material_maker/nodes/tones/tones.gd
@@ -175,3 +175,11 @@ func _on_Auto_pressed():
 	cursor_in_min.update_value(float(in_min)/float(histogram_size-1))
 	cursor_in_mid.update_value(float(in_mid)/float(histogram_size-1))
 	cursor_in_max.update_value(float(in_max)/float(histogram_size-1))
+
+
+func _on_reset_pressed() -> void:
+	cursor_in_min.update_value(0.0)
+	cursor_in_mid.update_value(0.5)
+	cursor_in_max.update_value(1.0)
+	cursor_out_min.update_value(0.0)
+	cursor_out_max.update_value(1.0)
diff --git a/material_maker/nodes/tones/tones.tscn b/material_maker/nodes/tones/tones.tscn
index b67f30fa9..dbcff5ab1 100644
--- a/material_maker/nodes/tones/tones.tscn
+++ b/material_maker/nodes/tones/tones.tscn
@@ -1,13 +1,18 @@
-[gd_scene load_steps=5 format=3 uid="uid://7wslfieqleli"]
+[gd_scene load_steps=7 format=3 uid="uid://7wslfieqleli"]
 
 [ext_resource type="PackedScene" uid="uid://0b6d65sghy3s" path="res://material_maker/widgets/histogram/histogram.tscn" id="1"]
 [ext_resource type="Script" uid="uid://nbk6k40bfmwi" path="res://material_maker/nodes/tones/tones.gd" id="2"]
-[ext_resource type="Texture2D" uid="uid://c0j4px4n72di5" path="res://material_maker/icons/icons.tres" id="3"]
+[ext_resource type="Texture2D" uid="uid://cvorvnes6fiq7" path="res://material_maker/icons/icons.svg" id="2_o4mha"]
+[ext_resource type="Texture2D" uid="uid://1s0c37uoj4rf" path="res://material_maker/theme/default_theme_icons.svg" id="3_hpd32"]
 
 [sub_resource type="AtlasTexture" id="1"]
-atlas = ExtResource("3")
+atlas = ExtResource("2_o4mha")
 region = Rect2(16, 80, 16, 16)
 
+[sub_resource type="AtlasTexture" id="AtlasTexture_jb2ll"]
+atlas = ExtResource("3_hpd32")
+region = Rect2(80, 192, 16, 16)
+
 [node name="Tones" type="GraphNode"]
 offset_right = 192.0
 offset_bottom = 141.0
@@ -77,6 +82,12 @@ size_flags_vertical = 4
 tooltip_text = "Set levels automatically"
 texture_normal = SubResource("1")
 
+[node name="Reset" type="TextureButton" parent="Bar"]
+layout_mode = 2
+size_flags_vertical = 4
+tooltip_text = "Reset levels"
+texture_normal = SubResource("AtlasTexture_jb2ll")
+
 [node name="Spacer1" type="Control" parent="."]
 custom_minimum_size = Vector2(0, 4)
 layout_mode = 2
@@ -91,3 +102,4 @@ layout_mode = 2
 
 [connection signal="item_selected" from="Bar/Mode" to="." method="_on_Mode_item_selected"]
 [connection signal="pressed" from="Bar/Auto" to="." method="_on_Auto_pressed"]
+[connection signal="pressed" from="Bar/Reset" to="." method="_on_reset_pressed"]
diff --git a/material_maker/theme/default_theme_icons.svg b/material_maker/theme/default_theme_icons.svg
index 783e1c918..a5d6fe651 100644
--- a/material_maker/theme/default_theme_icons.svg
+++ b/material_maker/theme/default_theme_icons.svg
@@ -28,15 +28,15 @@
      inkscape:deskcolor="#d1d1d1"
      inkscape:document-units="mm"
      showgrid="true"
-     inkscape:zoom="128"
-     inkscape:cx="55.242187"
-     inkscape:cy="37.707031"
+     inkscape:zoom="22.627417"
+     inkscape:cx="80.831144"
+     inkscape:cy="194.12291"
      inkscape:window-width="1152"
      inkscape:window-height="981"
      inkscape:window-x="0"
      inkscape:window-y="38"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g27">
+     inkscape:current-layer="g29">
     <inkscape:grid
        id="grid2"
        units="px"
@@ -80,6 +80,23 @@
   </sodipodi:namedview>
   <defs
      id="defs1">
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect30"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,2.1839154,0,1 @ F,0,0,1,0,2.9257121,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
     <inkscape:path-effect
        effect="fillet_chamfer"
        id="path-effect85"
@@ -2454,6 +2471,33 @@
        id="linearGradient96"
        gradientTransform="matrix(-9.5183323e-5,0,0,9.5183323e-5,2990.8886,68.329685)"
        gradientUnits="userSpaceOnUse" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect21-1-1"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0.96795223,0,1 @ F,0,0,1,0,0.96795223,0,1 @ F,0,0,1,0,0.96795223,0,1"
+       radius="2"
+       unit="px"
+       method="bezier"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#swatch4"
+       id="linearGradient97"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.5000014,-0.99999978)"
+       x1="117"
+       y1="25"
+       x2="126"
+       y2="25" />
   </defs>
   <g
      inkscape:groupmode="layer"
@@ -2518,6 +2562,25 @@
          inkscape:original-d="m 67.873155,197.53104 6.055523,0.0339 -1e-6,-11.09273 h 6.136328"
          transform="translate(-0.50264722,-0.11552464)" />
     </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g29"
+       inkscape:label="Reset"
+       transform="matrix(0,-1.0625937,1.0625937,0,-115.76182,296.03026)">
+      <path
+         id="path30"
+         style="fill:none;stroke:#ffffff;stroke-width:1.40396;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+         d="m 90.420466,187.94871 c 2.536855,0 4.593384,2.05652 4.593384,4.59338 0,2.53686 -2.056529,4.59338 -4.593384,4.59338 -2.536854,0 -4.593383,-2.05652 -4.593383,-4.59338"
+         sodipodi:nodetypes="cssc" />
+      <path
+         style="display:inline;fill:url(#linearGradient97);stroke:none;stroke-width:1.05073;stroke-linecap:round;paint-order:fill markers stroke"
+         d="m 116.46795,22 h 7.0641 c 0.53458,0 0.64405,0.287913 0.24449,0.643072 l -3.05308,2.713856 c -0.39956,0.355159 -1.04736,0.355159 -1.44692,0 l -3.05308,-2.713856 C 115.8239,22.287913 115.93337,22 116.46795,22 Z"
+         id="path8-2-8"
+         inkscape:path-effect="#path-effect21-1-1"
+         inkscape:original-d="m 115.5,22 h 9 l -4.5,4 z"
+         transform="matrix(0,0.6740468,-1.2455106,0,117.93013,107.21628)"
+         sodipodi:nodetypes="cccc" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"

From e61fb4e707020278f0bc6cf8136e98c0edbd2ec3 Mon Sep 17 00:00:00 2001
From: LMW <williamchange@gmail.com>
Date: Sun, 17 Aug 2025 16:48:22 +0800
Subject: [PATCH 2/2] Group Auto/Reset cursor actions for undoredo

---
 material_maker/nodes/tones/tones.gd | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/material_maker/nodes/tones/tones.gd b/material_maker/nodes/tones/tones.gd
index 5e46b497e..2c040cf7a 100644
--- a/material_maker/nodes/tones/tones.gd
+++ b/material_maker/nodes/tones/tones.gd
@@ -172,14 +172,18 @@ func _on_Auto_pressed():
 			if in_mid_value < value:
 				in_mid = i
 				in_mid_value = value
+	get_parent().undoredo.start_group()
 	cursor_in_min.update_value(float(in_min)/float(histogram_size-1))
 	cursor_in_mid.update_value(float(in_mid)/float(histogram_size-1))
 	cursor_in_max.update_value(float(in_max)/float(histogram_size-1))
+	get_parent().undoredo.end_group()
 
 
 func _on_reset_pressed() -> void:
+	get_parent().undoredo.start_group()
 	cursor_in_min.update_value(0.0)
 	cursor_in_mid.update_value(0.5)
 	cursor_in_max.update_value(1.0)
 	cursor_out_min.update_value(0.0)
 	cursor_out_max.update_value(1.0)
+	get_parent().undoredo.end_group()