From 1ad5bf27520a4d5e0e4fa574984fba55bc5b737a Mon Sep 17 00:00:00 2001
From: Fabien Freling <public@ffreling.com>
Date: Wed, 19 Feb 2020 13:43:49 +0100
Subject: [PATCH] add theme

---
 assets/taqin_theme.tres | 30 ++++++++++++++++++
 src/Main.tscn           | 69 +++++++++--------------------------------
 src/Taquin.tscn         |  2 +-
 3 files changed, 46 insertions(+), 55 deletions(-)
 create mode 100644 assets/taqin_theme.tres

diff --git a/assets/taqin_theme.tres b/assets/taqin_theme.tres
new file mode 100644
index 0000000..72b5f1f
--- /dev/null
+++ b/assets/taqin_theme.tres
@@ -0,0 +1,30 @@
+[gd_resource type="Theme" load_steps=6 format=2]
+
+[ext_resource path="res://assets/fonts/Montserrat-ExtraBolt-48.tres" type="DynamicFont" id=1]
+
+[sub_resource type="StyleBoxFlat" id=1]
+bg_color = Color( 0.12549, 0.235294, 0.337255, 1 )
+
+[sub_resource type="StyleBoxFlat" id=2]
+bg_color = Color( 0.12549, 0.235294, 0.337255, 1 )
+
+[sub_resource type="StyleBoxFlat" id=3]
+bg_color = Color( 0.0509804, 0.168627, 0.270588, 1 )
+
+[sub_resource type="StyleBoxFlat" id=4]
+bg_color = Color( 1, 0.831373, 0.639216, 1 )
+
+[resource]
+default_font = ExtResource( 1 )
+Button/colors/font_color = Color( 0.815686, 0.505882, 0.34902, 1 )
+Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
+Button/colors/font_color_hover = Color( 1, 0.92549, 0.839216, 1 )
+Button/colors/font_color_pressed = Color( 1, 0.92549, 0.839216, 1 )
+Button/constants/hseparation = 2
+Button/fonts/font = null
+Button/styles/disabled = null
+Button/styles/focus = null
+Button/styles/hover = SubResource( 1 )
+Button/styles/normal = SubResource( 2 )
+Button/styles/pressed = SubResource( 3 )
+Panel/styles/panel = SubResource( 4 )
diff --git a/src/Main.tscn b/src/Main.tscn
index 8738d4a..888ce4d 100644
--- a/src/Main.tscn
+++ b/src/Main.tscn
@@ -3,7 +3,7 @@
 [ext_resource path="res://src/Main.gd" type="Script" id=1]
 [ext_resource path="res://src/Taquin.tscn" type="PackedScene" id=2]
 [ext_resource path="res://src/GameState.gd" type="Script" id=3]
-[ext_resource path="res://assets/fonts/Montserrat-ExtraBolt-48.tres" type="DynamicFont" id=4]
+[ext_resource path="res://assets/taqin_theme.tres" type="Theme" id=5]
 
 [sub_resource type="Shader" id=1]
 code = "shader_type canvas_item;
@@ -21,11 +21,20 @@ shader_param/blur_amount = null
 [node name="Main" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
+theme = ExtResource( 5 )
 script = ExtResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="Background" type="Panel" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+theme = ExtResource( 5 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
 [node name="HSplitContainer" type="HSplitContainer" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -50,65 +59,17 @@ margin_right = 984.0
 margin_bottom = 560.0
 alignment = 1
 
-[node name="New Game" type="Button" parent="HSplitContainer/VSplitContainer"]
-margin_top = 228.0
+[node name="New game" type="Button" parent="HSplitContainer/VSplitContainer"]
+margin_top = 233.0
 margin_right = 436.0
 margin_bottom = 278.0
-rect_min_size = Vector2( 0, 50 )
-flat = true
-
-[node name="ColorRect" type="ColorRect" parent="HSplitContainer/VSplitContainer/New Game"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-color = Color( 0.0705882, 0.294118, 0.396078, 1 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="Label" type="Label" parent="HSplitContainer/VSplitContainer/New Game"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-custom_fonts/font = ExtResource( 4 )
-custom_colors/font_color_shadow = Color( 0.827451, 0.423529, 0.0666667, 1 )
-custom_constants/shadow_offset_x = 0
-custom_constants/shadow_offset_y = 2
-text = "New Game"
-align = 1
-valign = 1
-uppercase = true
-__meta__ = {
-"_edit_use_anchors_": false
-}
+text = "NEW GAME"
 
 [node name="Hints" type="Button" parent="HSplitContainer/VSplitContainer"]
 margin_top = 282.0
 margin_right = 436.0
-margin_bottom = 332.0
-rect_min_size = Vector2( 0, 50 )
-flat = true
-
-[node name="ColorRect" type="ColorRect" parent="HSplitContainer/VSplitContainer/Hints"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-color = Color( 0.0705882, 0.294118, 0.396078, 1 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="Label" type="Label" parent="HSplitContainer/VSplitContainer/Hints"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-custom_fonts/font = ExtResource( 4 )
-custom_colors/font_color_shadow = Color( 0.827451, 0.423529, 0.0666667, 1 )
-custom_constants/shadow_offset_x = 0
-custom_constants/shadow_offset_y = 2
-text = "Hints"
-align = 1
-valign = 1
-uppercase = true
-__meta__ = {
-"_edit_use_anchors_": false
-}
+margin_bottom = 327.0
+text = "HINTS"
 
 [node name="ColorRect" type="ColorRect" parent="."]
 material = SubResource( 2 )
diff --git a/src/Taquin.tscn b/src/Taquin.tscn
index ecf997c..a0c3069 100644
--- a/src/Taquin.tscn
+++ b/src/Taquin.tscn
@@ -56,7 +56,7 @@ difficulty = 0
 [node name="Background" type="ColorRect" parent="."]
 margin_right = 512.0
 margin_bottom = 512.0
-color = Color( 0.254902, 0.329412, 0.45098, 1 )
+color = Color( 0.12549, 0.235294, 0.337255, 1 )
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 anims/MovingPiece = SubResource( 1 )