From 7282406d10df97fadd8c819fc9ec1c095c774eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20H=C3=BCbner?= Date: Sat, 22 Sep 2018 21:22:16 +0200 Subject: [PATCH] button press style stuff --- game.gd | 6 ++++++ menus/main_menu.tscn | 27 ++++++++++++++------------- menus/options_menu.tscn | 16 ++++++++++++++-- 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/game.gd b/game.gd index 0c9fc44..4bde139 100644 --- a/game.gd +++ b/game.gd @@ -1,5 +1,11 @@ extends Node +# types of fades? + +class Fade: + func _init(): + pass + const Data = preload("res://data.gd") # pull them into Game too diff --git a/menus/main_menu.tscn b/menus/main_menu.tscn index 0e9e35f..f4cf046 100644 --- a/menus/main_menu.tscn +++ b/menus/main_menu.tscn @@ -9,7 +9,7 @@ content_margin_right = -1.0 content_margin_top = -1.0 content_margin_bottom = -1.0 -[node name="main_menu" type="Control"] +[node name="main_menu" type="Control" index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -67,15 +67,16 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 +margin_left = 472.0 margin_top = 242.0 -margin_right = 1024.0 -margin_bottom = 600.0 +margin_right = 552.0 +margin_bottom = 334.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 3 +size_flags_horizontal = 4 +size_flags_vertical = 2 alignment = 0 _sections_unfolded = [ "Size Flags" ] @@ -85,7 +86,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 1024.0 +margin_right = 80.0 margin_bottom = 20.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -97,7 +98,7 @@ size_flags_vertical = 1 custom_styles/focus = SubResource( 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) -custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) +custom_colors/font_color_pressed = Color( 1, 0.647059, 0, 1 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null @@ -113,7 +114,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 24.0 -margin_right = 1024.0 +margin_right = 80.0 margin_bottom = 44.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -125,7 +126,7 @@ size_flags_vertical = 1 custom_styles/focus = SubResource( 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) -custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) +custom_colors/font_color_pressed = Color( 1, 0.647059, 0, 1 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null @@ -141,7 +142,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 48.0 -margin_right = 1024.0 +margin_right = 80.0 margin_bottom = 68.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -153,7 +154,7 @@ size_flags_vertical = 1 custom_styles/focus = SubResource( 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) -custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) +custom_colors/font_color_pressed = Color( 1, 0.647059, 0, 1 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null @@ -169,7 +170,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 72.0 -margin_right = 1024.0 +margin_right = 80.0 margin_bottom = 92.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -181,7 +182,7 @@ size_flags_vertical = 1 custom_styles/focus = SubResource( 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) -custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) +custom_colors/font_color_pressed = Color( 1, 0.647059, 0, 1 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null diff --git a/menus/options_menu.tscn b/menus/options_menu.tscn index 26e8e7b..937fb0e 100644 --- a/menus/options_menu.tscn +++ b/menus/options_menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://menus/options_menu.gd" type="Script" id=1] [ext_resource path="res://menus/menu_button_normal.tres" type="StyleBox" id=2] @@ -39,6 +39,13 @@ anti_aliasing = true anti_aliasing_size = 1 _sections_unfolded = [ "Border", "Border Width", "Corner Radius", "Expand Margin" ] +[sub_resource type="StyleBoxEmpty" id=3] + +content_margin_left = -1.0 +content_margin_right = -1.0 +content_margin_top = -1.0 +content_margin_bottom = -1.0 + [node name="options_menu" type="Control" index="0"] anchor_left = 0.0 @@ -446,6 +453,11 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 +custom_styles/focus = SubResource( 3 ) +custom_colors/font_color_disabled = Color( 0.472656, 0.472656, 0.472656, 1 ) +custom_colors/font_color = Color( 1, 1, 1, 1 ) +custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) +custom_colors/font_color_pressed = Color( 1, 0.647059, 0, 1 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null @@ -453,6 +465,6 @@ group = null text = "back to menu" flat = true align = 1 -_sections_unfolded = [ "Rect", "Size Flags" ] +_sections_unfolded = [ "Rect", "Size Flags", "custom_colors", "custom_styles" ]