From ad3fddb4eb9766511323aa4f19ad2524427756e7 Mon Sep 17 00:00:00 2001 From: Nordup Date: Wed, 13 Aug 2025 12:43:25 +0700 Subject: [PATCH] onboarding mouse filter changes --- app/scenes/components/onboarding/board.tscn | 9 +++++++-- app/scenes/components/onboarding/onboarding.tscn | 4 +++- app/scenes/menu_body/home.tscn | 1 + app/scripts/ui/onboarding/board.gd | 2 +- app/scripts/ui/onboarding/close_button.gd | 4 ++-- app/shaders/vignette_blur.tres | 1 - 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/scenes/components/onboarding/board.tscn b/app/scenes/components/onboarding/board.tscn index 0036389..b801263 100644 --- a/app/scenes/components/onboarding/board.tscn +++ b/app/scenes/components/onboarding/board.tscn @@ -34,8 +34,9 @@ offset_bottom = 350.0 grow_horizontal = 2 grow_vertical = 2 pivot_offset = Vector2(300, 350) +mouse_filter = 1 script = ExtResource("1_dxxs8") -focus_button = NodePath("TextureButton") +focus_button = NodePath("Button") unfocus_color = Color(0.9, 0.9, 0.9, 0.5) unfocus_scale = Vector2(0.8, 0.8) @@ -46,6 +47,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +mouse_filter = 1 theme_override_styles/panel = SubResource("StyleBoxFlat_r2yvw") [node name="MarginContainer" type="MarginContainer" parent="."] @@ -111,10 +113,13 @@ theme_override_font_sizes/font_size = 20 text = "Wait" icon = null -[node name="TextureButton" type="TextureButton" parent="."] +[node name="Button" type="Button" parent="."] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +focus_mode = 0 +mouse_filter = 1 +flat = true diff --git a/app/scenes/components/onboarding/onboarding.tscn b/app/scenes/components/onboarding/onboarding.tscn index 53c2b3b..be50e25 100644 --- a/app/scenes/components/onboarding/onboarding.tscn +++ b/app/scenes/components/onboarding/onboarding.tscn @@ -101,6 +101,7 @@ offset_right = 756.0 offset_bottom = 350.0 grow_horizontal = 2 grow_vertical = 2 +mouse_filter = 2 [node name="Board" parent="Root/Carousel/Line" instance=ExtResource("3_04ofy")] layout_mode = 2 @@ -154,6 +155,7 @@ grow_vertical = 2 scale = Vector2(0.8, 0.8) pivot_offset = Vector2(300, 350) focus_mode = 0 +mouse_filter = 1 mouse_default_cursor_shape = 2 theme_override_styles/focus = SubResource("StyleBoxEmpty_vy2ch") theme_override_styles/hover = SubResource("StyleBoxEmpty_gh5x7") @@ -163,7 +165,7 @@ flat = true script = ExtResource("6_lcfru") content = NodePath("Centered") tween_duration = 0.2 -base_modulate = Color(1, 1, 1, 0.5) +normal_modulate = Color(1, 1, 1, 0.5) hover_scale = 1.2 [node name="Centered" type="Control" parent="Root/Carousel/Line/Close"] diff --git a/app/scenes/menu_body/home.tscn b/app/scenes/menu_body/home.tscn index 3f8f106..6b7892e 100644 --- a/app/scenes/menu_body/home.tscn +++ b/app/scenes/menu_body/home.tscn @@ -252,4 +252,5 @@ script = ExtResource("10_ant0e") url = "https://forms.gle/1NmJeCQnQh7Yc1KP8" [node name="Onboarding" parent="." instance=ExtResource("11_kyh0m")] +visible = false layout_mode = 1 diff --git a/app/scripts/ui/onboarding/board.gd b/app/scripts/ui/onboarding/board.gd index 93cac06..224ab9c 100644 --- a/app/scripts/ui/onboarding/board.gd +++ b/app/scripts/ui/onboarding/board.gd @@ -3,7 +3,7 @@ class_name OnboardingBoard signal request_focus -@export var focus_button: TextureButton +@export var focus_button: Button @export var unfocus_color: Color @export var unfocus_scale: Vector2 diff --git a/app/scripts/ui/onboarding/close_button.gd b/app/scripts/ui/onboarding/close_button.gd index 5e5a7e7..ce6dc33 100644 --- a/app/scripts/ui/onboarding/close_button.gd +++ b/app/scripts/ui/onboarding/close_button.gd @@ -2,7 +2,7 @@ extends Button @export var content: Control @export var tween_duration: float -@export var base_modulate: Color +@export var normal_modulate: Color @export var hover_scale: float var tween: Tween @@ -31,4 +31,4 @@ func on_mouse_exited() -> void: tween.set_trans(Tween.TRANS_QUAD).set_ease(Tween.EASE_OUT) tween.tween_property(content, "scale", Vector2.ONE, tween_duration) - tween.tween_property(content, "modulate", base_modulate, tween_duration) + tween.tween_property(content, "modulate", normal_modulate, tween_duration) diff --git a/app/shaders/vignette_blur.tres b/app/shaders/vignette_blur.tres index d59eb1a..7db91fd 100644 --- a/app/shaders/vignette_blur.tres +++ b/app/shaders/vignette_blur.tres @@ -143,7 +143,6 @@ void fragment() { } " -graph_offset = Vector2(-478.86, -398.352) mode = 1 modes/blend = 5 flags/light_only = false