From e9eff810e0e7e75abe84431868fcb3b8c26a6f17 Mon Sep 17 00:00:00 2001
From: sasha80 <sasha@mail.ru>
Date: Fri, 1 Dec 2023 14:54:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81?=
 =?UTF-8?q?=D1=81=D0=B5.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=82=D1=80=D0=B5=D1=82=D1=8C=D0=B5=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BB=D0=BE=D1=81=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/кнопка-квадрат-0.png   | Bin 397 -> 355 bytes
 data/кнопка-квадрат-1.png   | Bin 521 -> 477 bytes
 scenes/button-flat.tscn     |  91 +++++++++++++++++++++++++++++++-----
 scenes/nine-patch-button.gd |  20 ++++++--
 4 files changed, 96 insertions(+), 15 deletions(-)

diff --git a/data/кнопка-квадрат-0.png b/data/кнопка-квадрат-0.png
index 72b6a4cbddff83a257a48a47e5fdad62058b802f..33ef06996820647b995310f11c81798109874bcd 100644
GIT binary patch
literal 355
zcmeAS@N?(olHy`uVBq!ia0vp^!63}R1|%PEvIdfjTAnVBAr-gY-aVMx>>%QLalYgN
zcJWDm8BAQ8tUq-5#kfC_b8z0IU=cA*scDl<dHWt~sh|4yZ-1@&+vEG$rv2O0psHW%
zl$365>)o|3S;pO|eof}A8Ot==5+e*=@9I1K)ahA5?DfBU&U|%!Hs`*#X1UGpQ<n3+
zG`C+}f9s$7w4isj_v;gGUH@5Ax673Cq`jO9i$UTc5uX_btiozOGnzPsmn9r(;S7cf
zCUW5sRP#9qQQ4w7!vLldA-HmJ=xxbqb3SKU8!ov2``)&QxKyvx0Uno41O)@Vb}HVw
z&$aVcsG#6w6W8md-x~O~ykoRAXiu#8ld&@E`9{z6&!2Ix*y0(mSwChqFxVJ8UHx3v
IIVCg!0Ckp>%m4rY

literal 397
zcmeAS@N?(olHy`uVBq!ia0vp^!63}R1|%PEvIdfjA)YRdAr-gY-Zji?F%WUR*#1{_
z{Q;-V9H&aQ=roCL65OR3>1^T@*QmN7ctWRJ=Ai{szK30LzrSU@WZS}RxvK@5R90To
zvI@U!GHJ=2&DTn&Zp~f2@BP!g*SF<z?43C?^M3i+&pO<SC#u({MotNGdVV&k=hZGh
zMV6T=xwn^1nKY+Ze(4l;m*++2?gn{%f8M?AdVPxKQ$yd&>ORk<j(>c<`<fQ}N&7f0
zmV_owwMI_087yiu5}G_=yaXW_4=jPn!><WsAd(R!rq$;*cpMKq{Q3yP-@?vwcfB+x
z^;t?!?vtD*u{g-9yyINBS71+IT3Jlmxyax9R=>9T*09dz?R(n=b2jJ1hM)a>Cg^Hw
doqlL7<C9B?^RlEuje!Bo;OXk;vd$@?2>>#$rvLx|

diff --git a/data/кнопка-квадрат-1.png b/data/кнопка-квадрат-1.png
index 38fa9abf07ac3522ca58ef04e3157e8376a22f9f..ea400aa2600207e07c9ecbacfec5b5c1eb89902c 100644
GIT binary patch
literal 477
zcmeAS@N?(olHy`uVBq!ia0vp^!63}R1|%PEvIdfjOFUg1Ln>~)y}LiR*+HWHVZ23&
z(-$|lnaar(toaX)dGA=9$Q*V;Layb-o%w4f_boYagY98U#KcQ`@{iAdb#Zy~t9MTe
zENWh@Tld=KwAZARlDS@&>h@3H8ut9N<ihxAsWY88R;^lfe9N`0?Y9*_r<BItS1X?3
zk^MHBV_|E0<h5HyEd?@vF8wzB#Pm}!Q}yJ5uNyR8ia1HsW?z~q9)4`b_eC0~UNU*x
z&MIElYnZp}{4)dJK#`|qyKB#Wmf7ohuiDgi@wVKvLO!aVi)_xbKHC((=yh$zKLJT5
zgM%!S53mUPFbVq@98`hv3^<`Yhy*4NuO_g82ApU9XO}TQU-$aSUiWmh_kRz6wtr@@
zxOiReEVnn8?d&to?F{>S?E5qIGr>KD#@qQV@3Q$_^1M{FCGDR7{H@#e>|uEFUDES)
z_jQJw{%O-vCoK^;B)I%3Z+bLO-OGZ_>$1-=S1o#Ivp_p7G;}fRG_il-es&k)9d6X#
UZOyz>1&lBTPgg&ebxsLQ0I3qxSO5S3

literal 521
zcmeAS@N?(olHy`uVBq!ia0vp^!63}R1|%PEvIdfj7d%}YLn>~)y=$0v+d!i2VZRdV
zOQx2jFC1;ha^h^CZQ0qht*7nW11_5e)c_@Hi%c2!ytxY;rhk{^_2;h(ob_Y&-@5s;
zmj#A~PFgZ&^NW2whLe_L&NAU?j=5}d>uuSlYgzNsTlUQ;_B*|4#cQjbt5&6~z51{q
zfP-<a{<FQ|x3{fY<>fc&S!Ec9qidkevMGH6cf$ikW(yoTeOvgg-uV;ZC+1Juqr!dt
zteB_b(l5W;=X|a-TCaXx;&aUPug~5#sMb12AOAR`xb9a;-MT;bua)k-nYZ2k)Fzkr
zt0Wfx+IRhB$)@iKrz93{(qVlz-@ems?!pUy4vP!1Bs6iVHFB!WU{RZq(Bui@B?!TI
zU<phfeoY_)fkymaf0cVq@wqO;MVo_qK0f=`Z+a$G=6Le`?~mqv`|1dE?uySxzkkc0
zq4@mImNI_Jz5H{QD7<{g{Osu$QP+(-V+<Y4H&2q&+uLLK{A9_wlhx}54srW^pB^;n
zd)&FX@&)F;lc%Ky-rn|x`PVt=Kc(^)Oni$D8vujWEVOp<Yv0iQ4F8SinW!fftpi3b
NgQu&X%Q~loCIB04@ZA6a

diff --git a/scenes/button-flat.tscn b/scenes/button-flat.tscn
index f6d0c62..0a5b3d6 100644
--- a/scenes/button-flat.tscn
+++ b/scenes/button-flat.tscn
@@ -1,10 +1,66 @@
-[gd_scene load_steps=9 format=3 uid="uid://da7w3vkhadfwe"]
+[gd_scene load_steps=13 format=3 uid="uid://da7w3vkhadfwe"]
 
 [ext_resource type="Script" path="res://scenes/nine-patch-button.gd" id="1_mm6jw"]
 [ext_resource type="Texture2D" uid="uid://ct0ajcwno03h7" path="res://data/кнопка-квадрат-0.png" id="2_yle0i"]
 
 [sub_resource type="StyleBoxEmpty" id="1"]
 
+[sub_resource type="Shader" id="Shader_2bftm"]
+code = "shader_type canvas_item;
+
+uniform vec4 color_gap = vec4(0.0, 0.0, 0.0, 0.0);
+uniform vec4 color_stripe = vec4(0.3, 0.3, 0.3, 0.7);
+uniform float divisions = 50.0;   // increase for more stripe density
+uniform float stripe_bias = 2.0;  // 1.0 means no stripes; 2.0 means stripes and gaps are equal size
+uniform float speed = 0.01;
+uniform float angle = 0.7854;     // in radians
+uniform bool disabled = false;
+
+void fragment()
+{
+	float w = cos(angle) * UV.x + sin(angle) * UV.y - speed * TIME;
+	if ((floor(mod(w * divisions, stripe_bias)) < 0.0001) && disabled)
+    {
+		COLOR = color_gap;
+	}
+    else
+    {
+		COLOR = color_stripe;
+	}
+}
+
+
+"
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_hhdyc"]
+resource_local_to_scene = true
+shader = SubResource("Shader_2bftm")
+shader_parameter/color_gap = Vector4(1, 1, 1, 0.3)
+shader_parameter/color_stripe = Vector4(0, 0, 1, 0)
+shader_parameter/divisions = 50.0
+shader_parameter/stripe_bias = 2.0
+shader_parameter/speed = 0.0
+shader_parameter/angle = 0.7854
+shader_parameter/disabled = false
+
+[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_6nup5"]
+
+[sub_resource type="GDScript" id="GDScript_uyl5d"]
+script/source = "@tool
+
+extends Sprite2D
+
+
+@export var speed: float = 0.01:
+    set(val): material.set('shader_parameter/speed', val)
+    get: return material.get('shader_parameter/speed')
+
+
+@export var disabled: bool = false:
+    set(val): material.set('shader_parameter/disabled', val)
+    get: return material.get('shader_parameter/disabled')
+"
+
 [sub_resource type="StyleBoxEmpty" id="6"]
 
 [sub_resource type="StyleBoxEmpty" id="2"]
@@ -22,18 +78,7 @@ theme_override_styles/panel = SubResource("1")
 script = ExtResource("1_mm6jw")
 toggle_mode = true
 
-[node name="button" type="Button" parent="."]
-layout_mode = 2
-theme_override_styles/normal = SubResource("6")
-theme_override_styles/hover = SubResource("2")
-theme_override_styles/pressed = SubResource("3")
-theme_override_styles/disabled = SubResource("5")
-theme_override_styles/focus = SubResource("4")
-toggle_mode = true
-clip_text = true
-
 [node name="state" type="NinePatchRect" parent="."]
-show_behind_parent = true
 layout_mode = 2
 texture = ExtResource("2_yle0i")
 patch_margin_left = 10
@@ -43,4 +88,26 @@ patch_margin_bottom = 10
 axis_stretch_horizontal = 2
 axis_stretch_vertical = 2
 
+[node name="back" type="Sprite2D" parent="."]
+material = SubResource("ShaderMaterial_hhdyc")
+scale = Vector2(30, 30)
+texture = SubResource("PlaceholderTexture2D_6nup5")
+centered = false
+script = SubResource("GDScript_uyl5d")
+speed = 0.0
+
+[node name="button" type="Button" parent="."]
+layout_mode = 2
+theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
+theme_override_constants/outline_size = 4
+theme_override_styles/normal = SubResource("6")
+theme_override_styles/hover = SubResource("2")
+theme_override_styles/pressed = SubResource("3")
+theme_override_styles/disabled = SubResource("5")
+theme_override_styles/focus = SubResource("4")
+toggle_mode = true
+clip_text = true
+
+[connection signal="resized" from="." to="." method="_on_resized"]
+[connection signal="visibility_changed" from="back" to="back" method="_on_visibility_changed"]
 [connection signal="toggled" from="button" to="." method="_on_button_toggled"]
diff --git a/scenes/nine-patch-button.gd b/scenes/nine-patch-button.gd
index cc31a7a..750b44c 100644
--- a/scenes/nine-patch-button.gd
+++ b/scenes/nine-patch-button.gd
@@ -2,7 +2,7 @@
 
 extends PanelContainer
 
-## Кнопка текстурная на два состояния
+var save_modulate: Color
 
 
 @export var texture_state0: Texture2D = preload('res://data/кнопка-квадрат-0.png'):
@@ -19,7 +19,14 @@ extends PanelContainer
 
 
 @export var disabled: bool = false:
-    set(val): $button.set_disabled(val)
+    set(val):
+        $button.set_disabled(val)
+        $back.disabled = val
+        if val:
+            save_modulate = $state.modulate
+            $state.modulate *= Color(1.0, 1.0, 1.0, 0.5)
+        else:
+            $state.modulate = save_modulate
     get: return $button.disabled
 
 
@@ -37,11 +44,18 @@ extends PanelContainer
 
 func set_text(val: String): $button.set_text(val)
 func set_pressed(val: bool): $button.set_pressed(val)
-func set_disabled(val: bool): $button.set_disabled(val)
+func set_disabled(val: bool): disabled = val
 func button_connect(button_signal: String, proc: Callable): $button.connect(button_signal, proc)
 func get_text(): return $button.get_text()
 func is_pressed(): return $button.is_pressed()
 func is_toggle_mode(): return $button.is_toggle_mode()
+func _on_resized() -> void: $back.scale = size
+
+
+
+func _enter_tree() -> void:
+    $back.scale = size
+    save_modulate = modulate
 
 
 func set_toggle_mode (val: bool):