Skip to content

Commit

Permalink
Fixed most colors/margins
Browse files Browse the repository at this point in the history
  • Loading branch information
RedstoneMedia committed Jun 30, 2022
1 parent a737e8b commit 98e9722
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 90 deletions.
2 changes: 1 addition & 1 deletion game/app/scenes/about.gd
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func _process(_delta):

func _write_to_label():
# Fails when weird stuff happens with scene transitions. Don't ask me why.
# Also fails in editor sometimes.
# Also fails in editor sometimes.
# It can be savely ignored because it is called more than once!
if !is_instance_valid(_label):
return
Expand Down
2 changes: 0 additions & 2 deletions game/app/scenes/game_card.gd
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ onready var _texture_icon_rect := $Card/TitleSection/icon
onready var _label_playtime := $Card/TitleSection/VC/HC/LabelPlaytimeNumber
onready var _label_playtime_unit := $Card/TitleSection/VC/HC/LabelPlaytimeUnit


onready var _popup_label_title := $PopupDialogInfo/VC/TitleSection/HC/Title/LabelTitle
onready var _popup_label_description := $PopupDialogInfo/VC/InfoSection/HC/Description
onready var _popup_icon_rect := $PopupDialogInfo/VC/TitleSection/HC/TextureRectIcon
Expand All @@ -23,7 +22,6 @@ onready var _popup_playtime_unit_2 := $PopupDialogInfo/VC/TitleSection/HC/Title/
onready var _popup_label_highscore := $PopupDialogInfo/VC/TitleSection/HC/HighScore/LabelHighscore



func setup(game_config: ConfigFile):
_game_config = game_config
var game_id = game_config.get_meta("folder_name")
Expand Down
130 changes: 69 additions & 61 deletions game/app/scenes/game_card.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ border_width_left = 1
border_color = Color( 0.266667, 0.266667, 0.266667, 1 )

[sub_resource type="StyleBoxFlat" id=21]
content_margin_left = 5.0
content_margin_right = 5.0
content_margin_bottom = 1.0
content_margin_left = 16.0
content_margin_right = 16.0
content_margin_top = 16.0
content_margin_bottom = 16.0
bg_color = Color( 0.14902, 0.14902, 0.14902, 1 )
corner_radius_bottom_right = 1
corner_radius_bottom_left = 1
Expand All @@ -55,9 +56,9 @@ script = ExtResource( 1 )

[node name="Card" type="VBoxContainer" parent="."]
margin_left = 12.0
margin_top = 5.0
margin_top = 12.0
margin_right = 332.0
margin_bottom = 206.0
margin_bottom = 199.0
rect_min_size = Vector2( 296, 0 )

[node name="TitleSection" type="HBoxContainer" parent="Card"]
Expand Down Expand Up @@ -136,14 +137,14 @@ __meta__ = {
[node name="Description" type="RichTextLabel" parent="Card"]
margin_top = 67.0
margin_right = 320.0
margin_bottom = 163.0
margin_bottom = 149.0
size_flags_vertical = 3
bbcode_enabled = true

[node name="ButtonSection" type="HBoxContainer" parent="Card"]
margin_top = 166.0
margin_top = 152.0
margin_right = 320.0
margin_bottom = 201.0
margin_bottom = 187.0
alignment = 2
__meta__ = {
"_edit_use_anchors_": false
Expand All @@ -164,9 +165,9 @@ text = "T_PLAY"
[node name="PopupDialogInfo" type="PopupDialog" parent="."]
visible = true
margin_left = 12.0
margin_top = 5.0
margin_top = 12.0
margin_right = 332.0
margin_bottom = 206.0
margin_bottom = 199.0
rect_min_size = Vector2( 320, 0 )
custom_styles/panel = SubResource( 12 )
__meta__ = {
Expand All @@ -176,27 +177,31 @@ __meta__ = {
[node name="VC" type="VBoxContainer" parent="PopupDialogInfo"]
anchor_right = 1.0
anchor_bottom = 1.0
rect_min_size = Vector2( 500, 300 )
margin_left = 347.0
margin_top = 100.0
margin_right = 677.0
margin_bottom = 313.0
rect_min_size = Vector2( 650, 400 )
custom_constants/separation = 0
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": false
"_edit_lock_": true
}

[node name="TitleSection" type="PanelContainer" parent="PopupDialogInfo/VC"]
material = SubResource( 20 )
margin_right = 500.0
margin_bottom = 74.0
margin_right = 650.0
margin_bottom = 88.0
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": false
}

[node name="HC" type="HBoxContainer" parent="PopupDialogInfo/VC/TitleSection"]
margin_left = 12.0
margin_top = 5.0
margin_right = 488.0
margin_bottom = 69.0
margin_top = 12.0
margin_right = 638.0
margin_bottom = 76.0
custom_constants/separation = 10
alignment = 2
__meta__ = {
"_edit_use_anchors_": false
Expand All @@ -210,13 +215,13 @@ texture = ExtResource( 3 )
expand = true

[node name="Title" type="VBoxContainer" parent="PopupDialogInfo/VC/TitleSection/HC"]
margin_left = 67.0
margin_right = 324.0
margin_left = 74.0
margin_right = 460.0
margin_bottom = 64.0
size_flags_horizontal = 3

[node name="LabelTitle" type="Label" parent="PopupDialogInfo/VC/TitleSection/HC/Title"]
margin_right = 257.0
margin_right = 386.0
margin_bottom = 42.0
size_flags_vertical = 3
custom_fonts/font = SubResource( 10 )
Expand All @@ -225,7 +230,7 @@ valign = 1

[node name="HC" type="HBoxContainer" parent="PopupDialogInfo/VC/TitleSection/HC/Title"]
margin_top = 45.0
margin_right = 257.0
margin_right = 386.0
margin_bottom = 64.0
custom_constants/separation = 4

Expand Down Expand Up @@ -281,8 +286,8 @@ __meta__ = {
}

[node name="HighScore" type="VBoxContainer" parent="PopupDialogInfo/VC/TitleSection/HC"]
margin_left = 327.0
margin_right = 431.0
margin_left = 470.0
margin_right = 574.0
margin_bottom = 64.0
size_flags_horizontal = 8
alignment = 1
Expand Down Expand Up @@ -315,55 +320,57 @@ __meta__ = {
}

[node name="ButtonClosePopup" type="Button" parent="PopupDialogInfo/VC/TitleSection/HC"]
margin_left = 434.0
margin_right = 476.0
margin_left = 584.0
margin_right = 626.0
margin_bottom = 42.0
size_flags_horizontal = 8
size_flags_vertical = 0
theme = ExtResource( 8 )
icon = ExtResource( 5 )

[node name="InfoSection" type="PanelContainer" parent="PopupDialogInfo/VC"]
margin_top = 74.0
margin_right = 500.0
margin_bottom = 264.0
margin_top = 88.0
margin_right = 650.0
margin_bottom = 333.0
size_flags_vertical = 3
__meta__ = {
"_edit_use_anchors_": false
}

[node name="HC" type="HBoxContainer" parent="PopupDialogInfo/VC/InfoSection"]
margin_left = 12.0
margin_top = 5.0
margin_right = 488.0
margin_bottom = 185.0
margin_top = 12.0
margin_right = 638.0
margin_bottom = 233.0
custom_constants/separation = 16

[node name="Description" type="RichTextLabel" parent="PopupDialogInfo/VC/InfoSection/HC"]
margin_right = 358.0
margin_bottom = 180.0
margin_right = 393.0
margin_bottom = 221.0
size_flags_horizontal = 3
size_flags_stretch_ratio = 2.0
bbcode_enabled = true

[node name="VSeparator" type="VSeparator" parent="PopupDialogInfo/VC/InfoSection/HC"]
margin_left = 374.0
margin_right = 378.0
margin_bottom = 180.0
margin_left = 409.0
margin_right = 413.0
margin_bottom = 221.0
custom_styles/separator = SubResource( 16 )
__meta__ = {
"_edit_use_anchors_": false
}

[node name="VC" type="VBoxContainer" parent="PopupDialogInfo/VC/InfoSection/HC"]
margin_left = 394.0
margin_right = 476.0
margin_bottom = 180.0
margin_left = 429.0
margin_right = 626.0
margin_bottom = 221.0
size_flags_horizontal = 3
alignment = 1

[node name="Label" type="Label" parent="PopupDialogInfo/VC/InfoSection/HC/VC"]
margin_top = 43.0
margin_right = 82.0
margin_bottom = 62.0
margin_top = 64.0
margin_right = 197.0
margin_bottom = 83.0
size_flags_vertical = 1
custom_fonts/font = SubResource( 11 )
text = "T_AUTHOR"
Expand All @@ -372,9 +379,9 @@ __meta__ = {
}

[node name="LabelAuthor" type="Label" parent="PopupDialogInfo/VC/InfoSection/HC/VC"]
margin_top = 65.0
margin_right = 82.0
margin_bottom = 84.0
margin_top = 86.0
margin_right = 197.0
margin_bottom = 105.0
size_flags_vertical = 1
custom_fonts/font = SubResource( 11 )
text = "<author>"
Expand All @@ -384,15 +391,15 @@ __meta__ = {
}

[node name="Control" type="Control" parent="PopupDialogInfo/VC/InfoSection/HC/VC"]
margin_top = 87.0
margin_right = 82.0
margin_bottom = 92.0
margin_top = 108.0
margin_right = 197.0
margin_bottom = 113.0
rect_min_size = Vector2( 0, 5 )

[node name="Label2" type="Label" parent="PopupDialogInfo/VC/InfoSection/HC/VC"]
margin_top = 95.0
margin_right = 82.0
margin_bottom = 114.0
margin_top = 116.0
margin_right = 197.0
margin_bottom = 135.0
size_flags_vertical = 1
custom_fonts/font = SubResource( 11 )
text = "T_VERSION"
Expand All @@ -401,9 +408,9 @@ __meta__ = {
}

[node name="LabelVersion" type="Label" parent="PopupDialogInfo/VC/InfoSection/HC/VC"]
margin_top = 117.0
margin_right = 82.0
margin_bottom = 136.0
margin_top = 138.0
margin_right = 197.0
margin_bottom = 157.0
size_flags_vertical = 1
custom_fonts/font = SubResource( 11 )
text = "<version>"
Expand All @@ -413,15 +420,16 @@ __meta__ = {
}

[node name="PC3" type="PanelContainer" parent="PopupDialogInfo/VC"]
margin_top = 264.0
margin_right = 500.0
margin_bottom = 300.0
margin_top = 333.0
margin_right = 650.0
margin_bottom = 400.0
custom_styles/panel = SubResource( 21 )

[node name="ButtonPlay" type="Button" parent="PopupDialogInfo/VC/PC3"]
margin_left = 415.0
margin_right = 495.0
margin_bottom = 35.0
margin_left = 554.0
margin_top = 16.0
margin_right = 634.0
margin_bottom = 51.0
size_flags_horizontal = 8
text = "T_PLAY"

Expand Down
Loading

0 comments on commit 98e9722

Please sign in to comment.