From cbaddfbcdc19ed275e0620d94a391a13d9030437 Mon Sep 17 00:00:00 2001
From: Anthony Wilcox <35226681+tomiscw@users.noreply.github.com>
Date: Mon, 31 Dec 2018 04:17:50 -0500
Subject: [PATCH] Interface tweak

- Removed Splash.gd
---
 Clothes.tscn         | 36 ++++++++++-----------
 Interface.tscn       | 77 ++++++++++++++++++++++----------------------
 src/Splash.gd        |  6 ----
 src/WindowControl.gd |  3 +-
 windows/Credits.tscn |  2 +-
 5 files changed, 60 insertions(+), 64 deletions(-)
 delete mode 100644 src/Splash.gd

diff --git a/Clothes.tscn b/Clothes.tscn
index 59b19ed..d1428dc 100644
--- a/Clothes.tscn
+++ b/Clothes.tscn
@@ -17,7 +17,7 @@
 [ext_resource path="res://assets/camera.png" type="Texture" id=15]
 [ext_resource path="res://assets/owo censor.png" type="Texture" id=16]
 
-[node name="Clothes" type="Node2D"]
+[node name="Clothes" type="Node2D" index="0"]
 
 [node name="Wordrobe" type="ReferenceRect" parent="." index="0"]
 
@@ -25,9 +25,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 205.0
-margin_top = 33.0
-margin_right = 771.0
+margin_left = 193.0
+margin_top = 17.0
+margin_right = 775.0
 margin_bottom = 527.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
@@ -274,10 +274,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 231.0
-margin_top = 304.0
-margin_right = 337.0
-margin_bottom = 516.0
+margin_left = 224.0
+margin_top = 303.0
+margin_right = 330.0
+margin_bottom = 515.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2
@@ -299,10 +299,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 359.0
-margin_top = 328.0
-margin_right = 465.0
-margin_bottom = 519.0
+margin_left = 355.0
+margin_top = 332.0
+margin_right = 461.0
+margin_bottom = 523.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2
@@ -324,9 +324,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 209.0
+margin_left = 205.0
 margin_top = 52.0
-margin_right = 376.0
+margin_right = 372.0
 margin_bottom = 276.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
@@ -376,10 +376,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 419.0
-margin_top = 97.0
-margin_right = 468.0
-margin_bottom = 159.0
+margin_left = 409.0
+margin_top = 96.0
+margin_right = 458.0
+margin_bottom = 158.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2
diff --git a/Interface.tscn b/Interface.tscn
index 3c89187..719dbbe 100644
--- a/Interface.tscn
+++ b/Interface.tscn
@@ -25,9 +25,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 7.0
-margin_right = 799.0
-margin_bottom = 35.0
+margin_left = 11.0
+margin_top = 27.0
+margin_right = 165.0
+margin_bottom = 161.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
@@ -35,7 +36,7 @@ mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 
-[node name="HozContainer" type="HBoxContainer" parent="ReferenceRect" index="0"]
+[node name="VertContainer" type="VBoxContainer" parent="ReferenceRect" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -53,38 +54,14 @@ size_flags_horizontal = 1
 size_flags_vertical = 1
 alignment = 0
 
-[node name="AboutBtn" type="Button" parent="ReferenceRect/HozContainer" index="0"]
+[node name="ScreenshotBtn" type="Button" parent="ReferenceRect/VertContainer" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_right = 50.0
-margin_bottom = 22.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-text = "About"
-flat = false
-align = 1
-
-[node name="ScreenshotBtn" type="Button" parent="ReferenceRect/HozContainer" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 54.0
-margin_right = 137.0
-margin_bottom = 22.0
+margin_right = 147.0
+margin_bottom = 20.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2
@@ -100,15 +77,39 @@ text = "Screenshot"
 flat = false
 align = 1
 
-[node name="CreditsBtn" type="Button" parent="ReferenceRect/HozContainer" index="2"]
+[node name="AboutBtn" type="Button" parent="ReferenceRect/VertContainer" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 141.0
-margin_right = 198.0
-margin_bottom = 22.0
+margin_top = 24.0
+margin_right = 147.0
+margin_bottom = 44.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+focus_mode = 2
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+toggle_mode = false
+enabled_focus_mode = 2
+shortcut = null
+group = null
+text = "About"
+flat = false
+align = 1
+
+[node name="CreditsBtn" type="Button" parent="ReferenceRect/VertContainer" index="2"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_top = 48.0
+margin_right = 147.0
+margin_bottom = 68.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2
@@ -124,10 +125,10 @@ text = "Credits"
 flat = false
 align = 1
 
-[connection signal="pressed" from="ReferenceRect/HozContainer/AboutBtn" to="." method="_on_AboutBtn_pressed"]
+[connection signal="pressed" from="ReferenceRect/VertContainer/ScreenshotBtn" to="." method="_on_ScreenshotBtn_pressed"]
 
-[connection signal="pressed" from="ReferenceRect/HozContainer/ScreenshotBtn" to="." method="_on_ScreenshotBtn_pressed"]
+[connection signal="pressed" from="ReferenceRect/VertContainer/AboutBtn" to="." method="_on_AboutBtn_pressed"]
 
-[connection signal="pressed" from="ReferenceRect/HozContainer/CreditsBtn" to="." method="_on_CreditsBtn_pressed"]
+[connection signal="pressed" from="ReferenceRect/VertContainer/CreditsBtn" to="." method="_on_CreditsBtn_pressed"]
 
 
diff --git a/src/Splash.gd b/src/Splash.gd
deleted file mode 100644
index 4365ee6..0000000
--- a/src/Splash.gd
+++ /dev/null
@@ -1,6 +0,0 @@
-# Anthony Wilcox licenses this file to you under the GPL license.
-# See the LICENSE file in the project root for more information.
-extends Node
-
-func _on_Timer_timeout():
-	get_tree().change_scene("res://MainScreen.tscn")
diff --git a/src/WindowControl.gd b/src/WindowControl.gd
index ec8b27b..bf6f23c 100644
--- a/src/WindowControl.gd
+++ b/src/WindowControl.gd
@@ -1,5 +1,6 @@
 # Anthony Wilcox licenses this file to you under the GPL license.
 # See the LICENSE file in the project root for more information.
+tool 
 extends Control
 
 const DEFUALT_CONTENT_HEIGHT = 216
@@ -21,7 +22,7 @@ func _ready():
 		$WindowFrame.rect_size = Vector2(351, 33 + content_height)
 	else:
 		$WindowFrame/ContentFrame/ContentPanel.rect_size = DEFUALT_PANEL_SIZE
-		
+	
 	update()
 
 
diff --git a/windows/Credits.tscn b/windows/Credits.tscn
index 28d026a..3ed1442 100644
--- a/windows/Credits.tscn
+++ b/windows/Credits.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://widgets/WindowControl.tscn" type="PackedScene" id=1]
 
-[node name="Credits" type="Node" index="0"]
+[node name="Credits" type="Node"]
 
 [node name="WindowControl" parent="." index="0" instance=ExtResource( 1 )]