Browse Source

Tween Demo: Some more fixes to property accessors

Rémi Verschelde 8 years ago
parent
commit
058f050b80
5 changed files with 203 additions and 169 deletions
  1. 1 0
      .gitignore
  2. 1 1
      misc/tween/godot.png.import
  3. 38 38
      misc/tween/main.gd
  4. 161 129
      misc/tween/main.tscn
  5. 2 1
      misc/tween/project.godot

+ 1 - 0
.gitignore

@@ -1,6 +1,7 @@
 # Godot-specific ignores
 .import/
 export.cfg
+export_presets.cfg
 
 # System/tool-specific ignores
 .directory

+ 1 - 1
misc/tween/godot.png.import

@@ -20,4 +20,4 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false

+ 38 - 38
misc/tween/main.gd

@@ -16,26 +16,26 @@ func _ready():
 	for index in range(trans.size()):
 		var name = trans[index]
 		get_node("trans/" + name).connect("pressed", self, "on_trans_changed", [name, index])
-	
+
 	for index in range(eases.size()):
 		var name = eases[index]
 		get_node("eases/" + name).connect("pressed", self, "on_eases_changed", [name, index])
-	
+
 	for index in range(modes.size()):
 		var name = modes[index]
 		get_node("modes/" + name).connect("pressed", self, "on_modes_changed", [name])
-	
-	get_node("color/color_from").set_pick_color(Color(1, 0, 0, 1))
-	get_node("color/color_from").connect("color_changed", self, "on_color_changed")
-	
-	get_node("color/color_to").set_pick_color(Color(0, 1, 1, 1))
-	get_node("color/color_to").connect("color_changed", self, "on_color_changed")
-	
+
+	get_node("colors/color_from/picker").set_pick_color(Color(1, 0, 0, 1))
+	get_node("colors/color_from/picker").connect("color_changed", self, "on_color_changed")
+
+	get_node("colors/color_to/picker").set_pick_color(Color(0, 1, 1, 1))
+	get_node("colors/color_to/picker").connect("color_changed", self, "on_color_changed")
+
 	get_node("trans/linear").set_pressed(true)
 	get_node("eases/in").set_pressed(true)
 	get_node("modes/move").set_pressed(true)
 	get_node("modes/repeat").set_pressed(true)
-	
+
 	reset_tween()
 
 
@@ -43,10 +43,10 @@ func on_trans_changed(name, index):
 	for index in range(trans.size()):
 		var pressed = trans[index] == name
 		var btn = get_node("trans/" + trans[index])
-		
+
 		btn.set_pressed(pressed)
 		set_mouse_filter(Control.MOUSE_FILTER_IGNORE if pressed else Control.MOUSE_FILTER_PASS)
-	
+
 	state.trans = index
 	reset_tween()
 
@@ -55,10 +55,10 @@ func on_eases_changed(name, index):
 	for index in range(eases.size()):
 		var pressed = eases[index] == name
 		var btn = get_node("eases/" + eases[index])
-		
+
 		btn.set_pressed(pressed)
 		set_mouse_filter(Control.MOUSE_FILTER_IGNORE if pressed else Control.MOUSE_FILTER_PASS)
-	
+
 	state.eases = index
 	reset_tween()
 
@@ -85,53 +85,53 @@ func reset_tween():
 	var pos = tween.tell()
 	tween.reset_all()
 	tween.remove_all()
-	
+
 	var sprite = get_node("tween/area/sprite")
 	var follow = get_node("tween/area/follow")
 	var follow_2 = get_node("tween/area/follow_2")
 	var size = get_node("tween/area").get_size()
 
 	if get_node("modes/move").is_pressed():
-		tween.interpolate_method(sprite, "set_position", Vector2(0, 0), Vector2(size.width, size.height), 2, state.trans, state.eases)
-		tween.interpolate_property(sprite, "transform/position", Vector2(size.width, size.height), Vector2(0, 0), 2, state.trans, state.eases, 2)
-	
+		tween.interpolate_method(sprite, "set_position", Vector2(0, 0), Vector2(size.x, size.y), 2, state.trans, state.eases)
+		tween.interpolate_property(sprite, "position", Vector2(size.x, size.y), Vector2(0, 0), 2, state.trans, state.eases, 2)
+
 	if get_node("modes/color").is_pressed():
-		tween.interpolate_method(sprite, "set_modulate", get_node("color/color_from").get_pick_color(), get_node("color/color_to").get_pick_color(), 2, state.trans, state.eases)
-		tween.interpolate_property(sprite, "modulate", get_node("color/color_to").get_pick_color(), get_node("color/color_from").get_pick_color(), 2, state.trans, state.eases, 2)
+		tween.interpolate_method(sprite, "set_modulate", get_node("colors/color_from/picker").get_pick_color(), get_node("colors/color_to/picker").get_pick_color(), 2, state.trans, state.eases)
+		tween.interpolate_property(sprite, "modulate", get_node("colors/color_to/picker").get_pick_color(), get_node("colors/color_from/picker").get_pick_color(), 2, state.trans, state.eases, 2)
 	else:
 		sprite.set_modulate(Color(1,1,1,1))
-	
+
 	if get_node("modes/scale").is_pressed():
 		tween.interpolate_method(sprite, "set_scale", Vector2(0.5, 0.5), Vector2(1.5, 1.5), 2, state.trans, state.eases)
-		tween.interpolate_property(sprite, "transform/scale", Vector2(1.5, 1.5), Vector2(0.5, 0.5), 2, state.trans, state.eases, 2)
+		tween.interpolate_property(sprite, "scale", Vector2(1.5, 1.5), Vector2(0.5, 0.5), 2, state.trans, state.eases, 2)
 	else:
 		sprite.set_scale(Vector2(1,1))
-	
+
 	if get_node("modes/rotate").is_pressed():
-		tween.interpolate_method(sprite, "set_rotation_deg", 0, 360, 2, state.trans, state.eases)
-		tween.interpolate_property(sprite, "transform/rotation_deg", 360, 0, 2, state.trans, state.eases, 2)
-	
+		tween.interpolate_method(sprite, "set_rotation_in_degrees", 0, 360, 2, state.trans, state.eases)
+		tween.interpolate_property(sprite, "rotation_deg", 360, 0, 2, state.trans, state.eases, 2)
+
 	if get_node("modes/callback").is_pressed():
 		tween.interpolate_callback(self, 0.5, "on_callback", "0.5 second's after")
 		tween.interpolate_callback(self, 0.2, "on_callback", "1.2 second's after")
-	
+
 	if get_node("modes/follow").is_pressed():
 		follow.show()
 		follow_2.show()
-		
-		tween.follow_method(follow, "set_position", Vector2(0, size.height), sprite, "get_position", 2, state.trans, state.eases)
-		tween.targeting_method(follow, "set_position", sprite, "get_position", Vector2(0, size.height), 2, state.trans, state.eases, 2)
-		
-		tween.targeting_property(follow_2, "transform/position", sprite, "transform/position", Vector2(size.width, 0), 2, state.trans, state.eases)
-		tween.follow_property(follow_2, "transform/position", Vector2(size.width, 0), sprite, "transform/position", 2, state.trans, state.eases, 2)
+
+		tween.follow_method(follow, "set_position", Vector2(0, size.y), sprite, "get_position", 2, state.trans, state.eases)
+		tween.targeting_method(follow, "set_position", sprite, "get_position", Vector2(0, size.y), 2, state.trans, state.eases, 2)
+
+		tween.targeting_property(follow_2, "position", sprite, "position", Vector2(size.x, 0), 2, state.trans, state.eases)
+		tween.follow_property(follow_2, "position", Vector2(size.x, 0), sprite, "position", 2, state.trans, state.eases, 2)
 	else:
 		follow.hide()
 		follow_2.hide()
-	
+
 	tween.set_repeat(get_node("modes/repeat").is_pressed())
 	tween.start()
 	tween.seek(pos)
-	
+
 	if get_node("modes/pause").is_pressed():
 		tween.stop_all()
 		#get_node("timeline").set_ignore_mouse(false)
@@ -143,10 +143,10 @@ func reset_tween():
 
 func _on_tween_step(object, key, elapsed, value):
 	var timeline = get_node("timeline")
-	
+
 	var tween = get_node("tween")
 	var runtime = tween.get_runtime()
-	
+
 	var ratio = 100*(elapsed/runtime)
 	timeline.set_value(ratio)
 
@@ -154,7 +154,7 @@ func _on_tween_step(object, key, elapsed, value):
 func _on_timeline_value_changed(value):
 	if !get_node("modes/pause").is_pressed():
 		return
-	
+
 	var tween = get_node("tween")
 	var runtime = tween.get_runtime()
 	tween.seek(runtime*value/100)

+ 161 - 129
misc/tween/main.tscn

@@ -7,6 +7,7 @@
 
 margin_right = 800.0
 margin_bottom = 600.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -17,9 +18,10 @@ script = ExtResource( 1 )
 
 editor/display_folded = true
 margin_left = 56.0
-margin_top = 256.0
+margin_top = 288.0
 margin_right = 129.0
-margin_bottom = 582.0
+margin_bottom = 614.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 1
 size_flags_horizontal = 2
@@ -28,10 +30,9 @@ alignment = 0
 
 [node name="linear" type="Button" parent="trans"]
 
-margin_left = 12.0
-margin_top = 3.0
-margin_right = 60.0
-margin_bottom = 23.0
+margin_right = 48.0
+margin_bottom = 20.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -45,10 +46,10 @@ flat = false
 
 [node name="sine" type="Button" parent="trans"]
 
-margin_left = 17.0
-margin_top = 33.0
-margin_right = 56.0
-margin_bottom = 53.0
+margin_top = 30.0
+margin_right = 39.0
+margin_bottom = 50.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -62,10 +63,10 @@ flat = false
 
 [node name="quint" type="Button" parent="trans"]
 
-margin_left = 14.0
-margin_top = 63.0
-margin_right = 59.0
-margin_bottom = 83.0
+margin_top = 60.0
+margin_right = 45.0
+margin_bottom = 80.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -79,10 +80,10 @@ flat = false
 
 [node name="quart" type="Button" parent="trans"]
 
-margin_left = 14.0
-margin_top = 93.0
-margin_right = 59.0
-margin_bottom = 113.0
+margin_top = 90.0
+margin_right = 45.0
+margin_bottom = 110.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -96,10 +97,10 @@ flat = false
 
 [node name="quad" type="Button" parent="trans"]
 
-margin_left = 15.0
-margin_top = 123.0
-margin_right = 58.0
-margin_bottom = 143.0
+margin_top = 120.0
+margin_right = 43.0
+margin_bottom = 140.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -113,10 +114,10 @@ flat = false
 
 [node name="expo" type="Button" parent="trans"]
 
-margin_left = 15.0
-margin_top = 153.0
-margin_right = 58.0
-margin_bottom = 173.0
+margin_top = 150.0
+margin_right = 43.0
+margin_bottom = 170.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -130,10 +131,10 @@ flat = false
 
 [node name="elastic" type="Button" parent="trans"]
 
-margin_left = 9.0
-margin_top = 183.0
-margin_right = 63.0
-margin_bottom = 203.0
+margin_top = 180.0
+margin_right = 54.0
+margin_bottom = 200.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -147,10 +148,10 @@ flat = false
 
 [node name="cubic" type="Button" parent="trans"]
 
-margin_left = 13.0
-margin_top = 213.0
-margin_right = 59.0
-margin_bottom = 233.0
+margin_top = 210.0
+margin_right = 46.0
+margin_bottom = 230.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -164,10 +165,10 @@ flat = false
 
 [node name="circ" type="Button" parent="trans"]
 
-margin_left = 19.0
-margin_top = 243.0
-margin_right = 54.0
-margin_bottom = 263.0
+margin_top = 240.0
+margin_right = 35.0
+margin_bottom = 260.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -181,10 +182,10 @@ flat = false
 
 [node name="bounce" type="Button" parent="trans"]
 
-margin_left = 7.0
-margin_top = 273.0
-margin_right = 66.0
-margin_bottom = 293.0
+margin_top = 270.0
+margin_right = 59.0
+margin_bottom = 290.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -198,10 +199,10 @@ flat = false
 
 [node name="back" type="Button" parent="trans"]
 
-margin_left = 16.0
-margin_top = 303.0
-margin_right = 57.0
-margin_bottom = 323.0
+margin_top = 300.0
+margin_right = 41.0
+margin_bottom = 320.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -217,9 +218,10 @@ flat = false
 
 editor/display_folded = true
 margin_left = 152.0
-margin_top = 256.0
+margin_top = 288.0
 margin_right = 215.0
-margin_bottom = 372.0
+margin_bottom = 404.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 1
 size_flags_horizontal = 2
@@ -228,10 +230,9 @@ alignment = 0
 
 [node name="in" type="Button" parent="eases"]
 
-margin_left = 19.0
-margin_top = 3.0
-margin_right = 43.0
-margin_bottom = 23.0
+margin_right = 24.0
+margin_bottom = 20.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -245,10 +246,10 @@ flat = false
 
 [node name="out" type="Button" parent="eases"]
 
-margin_left = 15.0
-margin_top = 33.0
-margin_right = 48.0
-margin_bottom = 53.0
+margin_top = 30.0
+margin_right = 33.0
+margin_bottom = 50.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -262,10 +263,10 @@ flat = false
 
 [node name="in_out" type="Button" parent="eases"]
 
-margin_left = 6.0
-margin_top = 63.0
-margin_right = 57.0
-margin_bottom = 83.0
+margin_top = 60.0
+margin_right = 51.0
+margin_bottom = 80.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -279,10 +280,10 @@ flat = false
 
 [node name="out_in" type="Button" parent="eases"]
 
-margin_left = 6.0
-margin_top = 93.0
-margin_right = 57.0
-margin_bottom = 113.0
+margin_top = 90.0
+margin_right = 51.0
+margin_bottom = 110.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -298,9 +299,10 @@ flat = false
 
 editor/display_folded = true
 margin_left = 240.0
-margin_top = 256.0
+margin_top = 288.0
 margin_right = 317.0
-margin_bottom = 492.0
+margin_bottom = 524.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 1
 size_flags_horizontal = 2
@@ -309,10 +311,9 @@ alignment = 0
 
 [node name="move" type="Button" parent="modes"]
 
-margin_left = 14.0
-margin_top = 3.0
-margin_right = 62.0
-margin_bottom = 23.0
+margin_right = 48.0
+margin_bottom = 20.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -326,10 +327,10 @@ flat = false
 
 [node name="color" type="Button" parent="modes"]
 
-margin_left = 16.0
-margin_top = 33.0
-margin_right = 60.0
-margin_bottom = 53.0
+margin_top = 30.0
+margin_right = 44.0
+margin_bottom = 50.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -343,10 +344,10 @@ flat = false
 
 [node name="scale" type="Button" parent="modes"]
 
-margin_left = 16.0
-margin_top = 63.0
-margin_right = 61.0
-margin_bottom = 83.0
+margin_top = 60.0
+margin_right = 45.0
+margin_bottom = 80.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -360,10 +361,10 @@ flat = false
 
 [node name="rotate" type="Button" parent="modes"]
 
-margin_left = 13.0
-margin_top = 93.0
-margin_right = 63.0
-margin_bottom = 113.0
+margin_top = 90.0
+margin_right = 50.0
+margin_bottom = 110.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -377,10 +378,10 @@ flat = false
 
 [node name="callback" type="Button" parent="modes"]
 
-margin_left = 7.0
-margin_top = 123.0
-margin_right = 70.0
-margin_bottom = 143.0
+margin_top = 120.0
+margin_right = 63.0
+margin_bottom = 140.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -394,10 +395,10 @@ flat = false
 
 [node name="follow" type="Button" parent="modes"]
 
-margin_left = 13.0
-margin_top = 153.0
-margin_right = 63.0
-margin_bottom = 173.0
+margin_top = 150.0
+margin_right = 50.0
+margin_bottom = 170.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -411,10 +412,10 @@ flat = false
 
 [node name="repeat" type="Button" parent="modes"]
 
-margin_left = 12.0
-margin_top = 183.0
-margin_right = 65.0
-margin_bottom = 203.0
+margin_top = 180.0
+margin_right = 53.0
+margin_bottom = 200.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -428,10 +429,10 @@ flat = false
 
 [node name="pause" type="Button" parent="modes"]
 
-margin_left = 13.0
-margin_top = 213.0
-margin_right = 63.0
-margin_bottom = 233.0
+margin_top = 210.0
+margin_right = 50.0
+margin_bottom = 230.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -443,24 +444,37 @@ group = null
 text = "pause"
 flat = false
 
-[node name="color" type="VBoxContainer" parent="."]
+[node name="colors" type="HBoxContainer" parent="."]
 
-editor/display_folded = true
-margin_left = 384.0
-margin_top = 240.0
-margin_right = 760.0
-margin_bottom = 592.0
+margin_left = 352.0
+margin_top = 288.0
+margin_right = 858.0
+margin_bottom = 626.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+mouse_filter = 1
+size_flags_horizontal = 2
+size_flags_vertical = 2
+custom_constants/separation = 40
+alignment = 0
+
+[node name="color_from" type="VBoxContainer" parent="colors"]
+
+margin_right = 233.0
+margin_bottom = 338.0
+rect_min_size = Vector2( 0, 320 )
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 1
 size_flags_horizontal = 2
 size_flags_vertical = 2
 alignment = 0
 
-[node name="label_1" type="Label" parent="color"]
+[node name="label" type="Label" parent="colors/color_from"]
 
-margin_left = 151.0
-margin_right = 225.0
+margin_right = 74.0
 margin_bottom = 14.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
 size_flags_horizontal = 2
@@ -470,24 +484,37 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="color_from" type="ColorPicker" parent="color"]
+[node name="picker" type="ColorPicker" parent="colors/color_from"]
 
-margin_left = 71.0
 margin_top = 18.0
-margin_right = 304.0
-margin_bottom = 207.0
+margin_right = 233.0
+margin_bottom = 338.0
+rect_min_size = Vector2( 0, 320 )
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+mouse_filter = 1
+size_flags_horizontal = 2
+size_flags_vertical = 2
+alignment = 0
+
+[node name="color_to" type="VBoxContainer" parent="colors"]
+
+margin_left = 273.0
+margin_right = 506.0
+margin_bottom = 338.0
+rect_min_size = Vector2( 0, 320 )
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 1
 size_flags_horizontal = 2
 size_flags_vertical = 2
 alignment = 0
 
-[node name="label_2" type="Label" parent="color"]
+[node name="label" type="Label" parent="colors/color_to"]
 
-margin_left = 160.0
-margin_top = 211.0
-margin_right = 216.0
-margin_bottom = 225.0
+margin_right = 56.0
+margin_bottom = 14.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
 size_flags_horizontal = 2
@@ -497,12 +524,13 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="color_to" type="ColorPicker" parent="color"]
+[node name="picker" type="ColorPicker" parent="colors/color_to"]
 
-margin_left = 71.0
-margin_top = 229.0
-margin_right = 304.0
-margin_bottom = 418.0
+margin_top = 18.0
+margin_right = 233.0
+margin_bottom = 338.0
+rect_min_size = Vector2( 0, 320 )
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 1
 size_flags_horizontal = 2
@@ -520,8 +548,9 @@ playback/speed = 1.0
 
 margin_left = 32.0
 margin_top = 32.0
-margin_right = 768.0
-margin_bottom = 216.0
+margin_right = 896.0
+margin_bottom = 232.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -533,12 +562,14 @@ margin_left = 176.0
 margin_top = 24.0
 margin_right = 552.0
 margin_bottom = 160.0
+rect_pivot_offset = Vector2( 0, 0 )
 mouse_filter = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 bbcode_enabled = false
 bbcode_text = ""
 visible_characters = -1
+percent_visible = 1.0
 
 [node name="sprite" type="Sprite" parent="tween/area"]
 
@@ -546,9 +577,8 @@ texture = ExtResource( 2 )
 
 [node name="follow" type="Sprite" parent="tween/area"]
 
-position = Vector2( 0, 185 )
+position = Vector2( 0, 184 )
 texture = ExtResource( 2 )
-_sections_unfolded = [ "Animation", "Offset", "Region" ]
 
 [node name="follow_2" type="Sprite" parent="tween/area"]
 
@@ -557,10 +587,11 @@ texture = ExtResource( 2 )
 
 [node name="timeline" type="HSlider" parent="."]
 
-margin_left = 40.0
-margin_top = 224.0
-margin_right = 760.0
-margin_bottom = 240.0
+margin_left = 48.0
+margin_top = 240.0
+margin_right = 880.0
+margin_bottom = 256.0
+rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
@@ -572,6 +603,7 @@ page = 0.0
 value = 1.0
 exp_edit = false
 rounded = false
+editable = true
 tick_count = 0
 ticks_on_borders = false
 focus_mode = 2

+ 2 - 1
misc/tween/project.godot

@@ -10,7 +10,8 @@ target_fps=60
 
 stretch/aspect="keep_width"
 stretch/mode="2d"
-window/height=768
+window/width=928
+window/height=672
 
 [memory]