From 84e822bb4416c8f99e8a3ba772c7a6201f12dc6f Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Thu, 23 Apr 2020 23:25:12 +0300 Subject: [PATCH] Made Onion Skinning Settings dialog bigger - Fixes #220 --- Prefabs/AnimationTimeline.tscn | 23 +++++++++++++---------- Scripts/AnimationTimeline.gd | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Prefabs/AnimationTimeline.tscn b/Prefabs/AnimationTimeline.tscn index 1579a553c..a1cfe3199 100644 --- a/Prefabs/AnimationTimeline.tscn +++ b/Prefabs/AnimationTimeline.tscn @@ -579,28 +579,31 @@ margin_bottom = 200.0 [node name="AnimationTimer" type="Timer" parent="."] [node name="OnionSkinningSettings" type="WindowDialog" parent="."] -rect_min_size = Vector2( 136, 126 ) +rect_min_size = Vector2( 220, 126 ) __meta__ = { "_edit_use_anchors_": false } [node name="OnionSkinningButtons" type="VBoxContainer" parent="OnionSkinningSettings"] -margin_left = 8.0 -margin_top = 8.0 -margin_right = 134.0 -margin_bottom = 124.0 +anchor_top = 0.5 +anchor_right = 1.0 +anchor_bottom = 0.5 +margin_left = 4.0 +margin_top = -58.0 +margin_right = -4.0 +margin_bottom = 58.0 __meta__ = { "_edit_use_anchors_": false } [node name="OnionSkinningPast" type="Label" parent="OnionSkinningSettings/OnionSkinningButtons"] -margin_right = 126.0 +margin_right = 212.0 margin_bottom = 14.0 text = "Past Frames" [node name="PastOnionSkinning" type="SpinBox" parent="OnionSkinningSettings/OnionSkinningButtons"] margin_top = 18.0 -margin_right = 126.0 +margin_right = 212.0 margin_bottom = 42.0 mouse_default_cursor_shape = 2 min_value = 1.0 @@ -609,13 +612,13 @@ align = 1 [node name="OnionSkinningFuture" type="Label" parent="OnionSkinningSettings/OnionSkinningButtons"] margin_top = 46.0 -margin_right = 126.0 +margin_right = 212.0 margin_bottom = 60.0 text = "Future Frames" [node name="FutureOnionSkinning" type="SpinBox" parent="OnionSkinningSettings/OnionSkinningButtons"] margin_top = 64.0 -margin_right = 126.0 +margin_right = 212.0 margin_bottom = 88.0 mouse_default_cursor_shape = 2 min_value = 1.0 @@ -624,7 +627,7 @@ align = 1 [node name="BlueRedMode" type="CheckBox" parent="OnionSkinningSettings/OnionSkinningButtons"] margin_top = 92.0 -margin_right = 126.0 +margin_right = 212.0 margin_bottom = 116.0 mouse_default_cursor_shape = 2 text = "Blue-Red Mode" diff --git a/Scripts/AnimationTimeline.gd b/Scripts/AnimationTimeline.gd index 40582994e..e3f813440 100644 --- a/Scripts/AnimationTimeline.gd +++ b/Scripts/AnimationTimeline.gd @@ -184,7 +184,7 @@ func _on_OnionSkinning_pressed() -> void: func _on_OnionSkinningSettings_pressed() -> void: - $OnionSkinningSettings.popup(Rect2(Global.onion_skinning_button.rect_global_position.x - 152, Global.onion_skinning_button.rect_global_position.y - 106, 136, 126)) + $OnionSkinningSettings.popup(Rect2(Global.onion_skinning_button.rect_global_position.x - $OnionSkinningSettings.rect_size.x - 16, Global.onion_skinning_button.rect_global_position.y - 106, 136, 126)) func _on_LoopAnim_pressed() -> void: