From e06586edce14b4bbbcd5ad7ac9552affa2acf72b Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Fri, 27 Dec 2019 16:27:39 +0200 Subject: [PATCH] TimelineSeconds now being re-drawn when scrolling through the frames For some reason, scroll_ended() and scroll_started() signals of the ScrollContainer are not working. --- Main.tscn | 3 +-- Scripts/Rulers/TimelineSeconds.gd | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Main.tscn b/Main.tscn index e62e2e09d..03f0c607f 100644 --- a/Main.tscn +++ b/Main.tscn @@ -250,7 +250,6 @@ text = "[64×64]" align = 2 [node name="UI" type="HBoxContainer" parent="MenuAndUI"] -editor/display_folded = true margin_top = 28.0 margin_right = 1152.0 margin_bottom = 648.0 @@ -900,7 +899,6 @@ mouse_default_cursor_shape = 2 text = "Vertical" [node name="CanvasAndTimeline" type="VBoxContainer" parent="MenuAndUI/UI"] -editor/display_folded = true margin_left = 224.0 margin_right = 928.0 margin_bottom = 620.0 @@ -1994,6 +1992,7 @@ visible = false [connection signal="value_changed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons/FPSValue" to="." method="_on_FPSValue_value_changed"] [connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons/LoopAnim" to="." method="_on_LoopAnim_pressed"] [connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/FrameAndButtonContainer/AddFrame" to="." method="add_frame"] +[connection signal="gui_input" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/FrameAndButtonContainer/ScrollContainer" to="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/TimelineSeconds" method="_on_ScrollContainer_gui_input"] [connection signal="value_changed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons/PastOnionSkinning" to="." method="_on_PastOnionSkinning_value_changed"] [connection signal="value_changed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons/FutureOnionSkinning" to="." method="_on_FutureOnionSkinning_value_changed"] [connection signal="toggled" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons/BlueRedMode" to="." method="_on_BlueRedMode_toggled"] diff --git a/Scripts/Rulers/TimelineSeconds.gd b/Scripts/Rulers/TimelineSeconds.gd index 23e4324b1..7c8607d0a 100644 --- a/Scripts/Rulers/TimelineSeconds.gd +++ b/Scripts/Rulers/TimelineSeconds.gd @@ -9,8 +9,7 @@ var minor_subdivision := 3 var first : Vector2 var last : Vector2 - -#Code taken and modified from Godot's source code +# Code taken and modified from Godot's source code func _draw() -> void: var color := Color.white if Global.theme_type == "Gold" || Global.theme_type == "Light": @@ -52,3 +51,7 @@ func _draw() -> void: draw_line(Vector2(position.x + RULER_WIDTH, RULER_WIDTH * 0.33), Vector2(position.x + RULER_WIDTH, RULER_WIDTH), color) else: draw_line(Vector2(position.x + RULER_WIDTH, RULER_WIDTH * 0.66), Vector2(position.x + RULER_WIDTH, RULER_WIDTH), color) + +# warning-ignore:unused_argument +func _on_ScrollContainer_gui_input(event) -> void: + update()