From 957df3192fbd5e6bf57401e5ad9a8e2f4f6eb177 Mon Sep 17 00:00:00 2001 From: ASecondGuy Date: Fri, 1 Jul 2022 00:17:49 +0200 Subject: [PATCH 1/3] fix visuals --- game/app/scenes/about.gd | 3 +- game/app/scenes/game_card.tscn | 156 +++++++++++++++------------- game/app/scenes/menu.tscn | 63 +++++++---- game/app/style/main_theme.tres | 10 +- game/app/style/theme_game_card.tres | 14 +-- game/app/style/title_font.tres | 4 +- 6 files changed, 135 insertions(+), 115 deletions(-) diff --git a/game/app/scenes/about.gd b/game/app/scenes/about.gd index b5be3137..7d57fb7d 100644 --- a/game/app/scenes/about.gd +++ b/game/app/scenes/about.gd @@ -44,7 +44,8 @@ func _write_to_label(): for key in line.split(" "): if key.match("[/*]"): - _label.pop() + for _i in range(key.count("[")): + _label.pop() else: if first: _label.append_bbcode(tr(key)) diff --git a/game/app/scenes/game_card.tscn b/game/app/scenes/game_card.tscn index 097bb715..6caa2a89 100644 --- a/game/app/scenes/game_card.tscn +++ b/game/app/scenes/game_card.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=18 format=2] [ext_resource path="res://app/scenes/game_card.gd" type="Script" id=1] [ext_resource path="res://shared/fonts/roboto/roboto_regular.ttf" type="DynamicFontData" id=2] @@ -15,10 +15,7 @@ font_data = ExtResource( 4 ) [sub_resource type="DynamicFont" id=9] font_data = ExtResource( 2 ) -[sub_resource type="StyleBoxFlat" id=12] -bg_color = Color( 0, 0, 0, 0 ) -shadow_color = Color( 0, 0, 0, 0.133333 ) -shadow_size = 6 +[sub_resource type="StyleBoxEmpty" id=22] [sub_resource type="ShaderMaterial" id=20] shader = ExtResource( 6 ) @@ -30,6 +27,13 @@ font_data = ExtResource( 4 ) [sub_resource type="DynamicFont" id=11] font_data = ExtResource( 2 ) +[sub_resource type="StyleBoxFlat" id=23] +content_margin_left = 15.0 +content_margin_right = 15.0 +content_margin_top = 5.0 +content_margin_bottom = 5.0 +bg_color = Color( 0.203922, 0.2, 0.2, 1 ) + [sub_resource type="StyleBoxFlat" id=16] border_width_left = 1 border_color = Color( 0.266667, 0.266667, 0.266667, 1 ) @@ -37,7 +41,8 @@ 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_top = 5.0 +content_margin_bottom = 5.0 bg_color = Color( 0.14902, 0.14902, 0.14902, 1 ) corner_radius_bottom_right = 1 corner_radius_bottom_left = 1 @@ -55,9 +60,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"] @@ -86,7 +91,7 @@ __meta__ = { [node name="LabelTitle" type="Label" parent="Card/TitleSection/VC"] margin_right = 246.0 -margin_bottom = 42.0 +margin_bottom = 40.0 size_flags_vertical = 3 custom_fonts/font = SubResource( 1 ) text = "" @@ -134,24 +139,24 @@ __meta__ = { } [node name="Description" type="RichTextLabel" parent="Card"] -margin_top = 67.0 +margin_top = 69.0 margin_right = 320.0 -margin_bottom = 163.0 +margin_bottom = 147.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 } [node name="ButtonInfo" type="Button" parent="Card/ButtonSection"] -margin_left = 161.0 -margin_right = 237.0 +margin_left = 159.0 +margin_right = 235.0 margin_bottom = 35.0 text = "T_INFO" @@ -162,13 +167,12 @@ margin_bottom = 35.0 text = "T_PLAY" [node name="PopupDialogInfo" type="PopupDialog" parent="."] -visible = true margin_left = 12.0 -margin_top = 5.0 -margin_right = 332.0 -margin_bottom = 206.0 -rect_min_size = Vector2( 320, 0 ) -custom_styles/panel = SubResource( 12 ) +margin_top = 10.0 +margin_right = 662.0 +margin_bottom = 410.0 +rect_min_size = Vector2( 650, 400 ) +custom_styles/panel = SubResource( 22 ) __meta__ = { "_edit_lock_": true } @@ -185,8 +189,8 @@ __meta__ = { [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 = 79.0 __meta__ = { "_edit_lock_": true, "_edit_use_anchors_": false @@ -194,9 +198,9 @@ __meta__ = { [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 = 10.0 +margin_right = 638.0 +margin_bottom = 74.0 alignment = 2 __meta__ = { "_edit_use_anchors_": false @@ -210,14 +214,14 @@ 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 = 69.0 +margin_right = 470.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_bottom = 42.0 +margin_right = 401.0 +margin_bottom = 40.0 size_flags_vertical = 3 custom_fonts/font = SubResource( 10 ) text = "" @@ -225,7 +229,7 @@ valign = 1 [node name="HC" type="HBoxContainer" parent="PopupDialogInfo/VC/TitleSection/HC/Title"] margin_top = 45.0 -margin_right = 257.0 +margin_right = 401.0 margin_bottom = 64.0 custom_constants/separation = 4 @@ -281,8 +285,8 @@ __meta__ = { } [node name="HighScore" type="VBoxContainer" parent="PopupDialogInfo/VC/TitleSection/HC"] -margin_left = 327.0 -margin_right = 431.0 +margin_left = 475.0 +margin_right = 579.0 margin_bottom = 64.0 size_flags_horizontal = 8 alignment = 1 @@ -291,9 +295,9 @@ __meta__ = { } [node name="Label" type="Label" parent="PopupDialogInfo/VC/TitleSection/HC/HighScore"] -margin_top = 11.0 +margin_top = 10.0 margin_right = 104.0 -margin_bottom = 30.0 +margin_bottom = 29.0 size_flags_horizontal = 3 custom_fonts/font = SubResource( 11 ) text = "T_HIGHSCORE" @@ -303,9 +307,9 @@ __meta__ = { } [node name="LabelHighscore" type="Label" parent="PopupDialogInfo/VC/TitleSection/HC/HighScore"] -margin_top = 33.0 +margin_top = 34.0 margin_right = 104.0 -margin_bottom = 52.0 +margin_bottom = 53.0 size_flags_horizontal = 3 custom_fonts/font = SubResource( 11 ) text = "" @@ -315,8 +319,8 @@ __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 @@ -324,46 +328,47 @@ 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 = 79.0 +margin_right = 650.0 +margin_bottom = 355.0 size_flags_vertical = 3 +custom_styles/panel = SubResource( 23 ) __meta__ = { "_edit_use_anchors_": false } [node name="HC" type="HBoxContainer" parent="PopupDialogInfo/VC/InfoSection"] -margin_left = 12.0 +margin_left = 15.0 margin_top = 5.0 -margin_right = 488.0 -margin_bottom = 185.0 +margin_right = 635.0 +margin_bottom = 271.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 = 417.0 +margin_bottom = 266.0 size_flags_horizontal = 3 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 = 433.0 +margin_right = 437.0 +margin_bottom = 266.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 -alignment = 1 +margin_left = 453.0 +margin_right = 620.0 +margin_bottom = 266.0 +size_flags_horizontal = 3 +size_flags_stretch_ratio = 0.4 [node name="Label" type="Label" parent="PopupDialogInfo/VC/InfoSection/HC/VC"] -margin_top = 43.0 -margin_right = 82.0 -margin_bottom = 62.0 +margin_right = 167.0 +margin_bottom = 19.0 size_flags_vertical = 1 custom_fonts/font = SubResource( 11 ) text = "T_AUTHOR" @@ -372,9 +377,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 = 24.0 +margin_right = 167.0 +margin_bottom = 43.0 size_flags_vertical = 1 custom_fonts/font = SubResource( 11 ) text = "" @@ -384,15 +389,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 = 48.0 +margin_right = 167.0 +margin_bottom = 53.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 = 58.0 +margin_right = 167.0 +margin_bottom = 77.0 size_flags_vertical = 1 custom_fonts/font = SubResource( 11 ) text = "T_VERSION" @@ -401,9 +406,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 = 82.0 +margin_right = 167.0 +margin_bottom = 101.0 size_flags_vertical = 1 custom_fonts/font = SubResource( 11 ) text = "" @@ -413,15 +418,16 @@ __meta__ = { } [node name="PC3" type="PanelContainer" parent="PopupDialogInfo/VC"] -margin_top = 264.0 -margin_right = 500.0 -margin_bottom = 300.0 +margin_top = 355.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 = 565.0 +margin_top = 5.0 +margin_right = 645.0 +margin_bottom = 40.0 size_flags_horizontal = 8 text = "T_PLAY" diff --git a/game/app/scenes/menu.tscn b/game/app/scenes/menu.tscn index e16ca204..1a32b117 100644 --- a/game/app/scenes/menu.tscn +++ b/game/app/scenes/menu.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://app/scenes/about.gd" type="Script" id=1] [ext_resource path="res://app/images/suffragium_badge_36.png" type="Texture" id=2] [ext_resource path="res://app/style/main_theme.tres" type="Theme" id=3] [ext_resource path="res://app/style/title_font.tres" type="DynamicFont" id=4] [ext_resource path="res://app/scenes/menu.gd" type="Script" id=5] +[ext_resource path="res://app/images/cogwheel_16.png" type="Texture" id=6] [ext_resource path="res://app/scenes/settings.gd" type="Script" id=7] [sub_resource type="StyleBoxEmpty" id=19] @@ -17,13 +18,13 @@ script = ExtResource( 5 ) [node name="MenuBar" type="PanelContainer" parent="."] margin_right = 1024.0 -margin_bottom = 56.0 +margin_bottom = 52.0 [node name="VC" type="HBoxContainer" parent="MenuBar"] -margin_left = 10.0 -margin_top = 10.0 -margin_right = 1014.0 -margin_bottom = 46.0 +margin_left = 8.0 +margin_top = 8.0 +margin_right = 1016.0 +margin_bottom = 44.0 [node name="LogoBadge" type="TextureRect" parent="MenuBar/VC"] margin_right = 36.0 @@ -55,14 +56,15 @@ margin_bottom = 36.0 text = "T_REPORT_A_BUG" [node name="ButtonSettings" type="Button" parent="MenuBar/VC"] -margin_left = 888.0 -margin_right = 1004.0 +margin_left = 870.0 +margin_right = 1008.0 margin_bottom = 36.0 size_flags_horizontal = 10 text = "T_SETTINGS" +icon = ExtResource( 6 ) [node name="TabContainer" type="TabContainer" parent="."] -margin_top = 61.0 +margin_top = 57.0 margin_right = 1024.0 margin_bottom = 600.0 size_flags_vertical = 3 @@ -78,17 +80,19 @@ anchor_bottom = 1.0 [node name="MC" type="MarginContainer" parent="TabContainer/Games"] margin_right = 1024.0 -margin_bottom = 56.0 +margin_bottom = 55.0 +size_flags_vertical = 0 [node name="Toolbar" type="HBoxContainer" parent="TabContainer/Games/MC"] margin_left = 15.0 +margin_top = 10.0 margin_right = 1009.0 -margin_bottom = 41.0 +margin_bottom = 45.0 alignment = 2 [node name="Label" type="Label" parent="TabContainer/Games/MC/Toolbar"] margin_right = 729.0 -margin_bottom = 41.0 +margin_bottom = 35.0 size_flags_horizontal = 3 size_flags_vertical = 1 custom_fonts/font = ExtResource( 4 ) @@ -98,7 +102,7 @@ valign = 1 [node name="Label2" type="Label" parent="TabContainer/Games/MC/Toolbar"] margin_left = 734.0 margin_right = 818.0 -margin_bottom = 41.0 +margin_bottom = 35.0 size_flags_vertical = 1 text = "T_SORTING" valign = 1 @@ -109,24 +113,26 @@ __meta__ = { [node name="OptionButtonSorting" type="OptionButton" parent="TabContainer/Games/MC/Toolbar"] margin_left = 823.0 margin_right = 994.0 -margin_bottom = 41.0 +margin_bottom = 35.0 text = "T_ALPHABETICAL" items = [ "T_LONGST_PLAYTIME", null, false, 0, null, "T_ALPHABETICAL", null, false, 1, null, "T_LAST_PLAYED", null, false, 2, null ] selected = 1 [node name="SC" type="ScrollContainer" parent="TabContainer/Games"] -margin_top = 61.0 +margin_top = 60.0 margin_right = 1024.0 -margin_bottom = 539.0 +margin_bottom = 543.0 size_flags_vertical = 3 [node name="MC" type="MarginContainer" parent="TabContainer/Games/SC"] margin_right = 30.0 -margin_bottom = 15.0 +margin_bottom = 20.0 [node name="GC" type="GridContainer" parent="TabContainer/Games/SC/MC"] margin_left = 15.0 +margin_top = 10.0 margin_right = 15.0 +margin_bottom = 10.0 custom_constants/vseparation = 4 custom_constants/hseparation = 4 columns = 3 @@ -137,12 +143,17 @@ anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 1 ) text = "# T_ABOUT_SUFFRAGIUM + T_ABOUT_SUFFRAGIUM_1 T_ABOUT_SUFFRAGIUM_2 + + # T_PARTICIPATE + T_PARTICIPATE_1 +T_PARTICIPATE_PLEASE_NOTE T_PARTICIPATE_PLEASE_NOTE_1 T_PARTICIPATE_PLEASE_NOTE_2 T_PARTICIPATE_PLEASE_NOTE_3 @@ -154,11 +165,15 @@ T_PARTICIPATE_POSSIBILITIES_3 T_PARTICIPATE_POSSIBILITIES_4 T_PARTICIPATE_GUIDES -[url=\"https://github.com/letsgamedev/Suffragium/blob/main/CONTRIBUTING.md#contributing-to-suffragium\"]Contributing to Suffragium [/url] -[url=https://github.com/letsgamedev/Suffragium/blob/main/game/games/testgame/README.md]How to add a game [/url] +[color=#26a8ff][url=\"https://github.com/letsgamedev/Suffragium/blob/main/CONTRIBUTING.md#contributing-to-suffragium\"]Contributing to Suffragium [/url][/color] +[color=#26a8ff][url=https://github.com/letsgamedev/Suffragium/blob/main/game/games/testgame/README.md]How to add a game [/url][/color] T_ABOUT_SUFFRAGIUM -T_REPORT_A_BUG + + +# T_REPORT_A_BUG + +T_PARTICIPATE_PLEASE_NOTE T_PARTICIPATE_PLEASE_NOTE_1 T_PARTICIPATE_PLEASE_NOTE_2 T_PARTICIPATE_PLEASE_NOTE_3 @@ -168,14 +183,15 @@ title_font = ExtResource( 4 ) [node name="MC" type="MarginContainer" parent="TabContainer/About"] margin_right = 1024.0 -margin_bottom = 539.0 +margin_bottom = 634.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="RichTextLabel" type="RichTextLabel" parent="TabContainer/About/MC"] margin_left = 15.0 +margin_top = 10.0 margin_right = 1009.0 -margin_bottom = 524.0 +margin_bottom = 624.0 size_flags_horizontal = 3 size_flags_vertical = 3 bbcode_enabled = true @@ -219,11 +235,12 @@ script = ExtResource( 7 ) [node name="MC" type="MarginContainer" parent="TabContainer/Settings"] margin_right = 1024.0 -margin_bottom = 214.0 +margin_bottom = 209.0 size_flags_horizontal = 3 [node name="VC" type="VBoxContainer" parent="TabContainer/Settings/MC"] margin_left = 15.0 +margin_top = 10.0 margin_right = 1009.0 margin_bottom = 199.0 diff --git a/game/app/style/main_theme.tres b/game/app/style/main_theme.tres index b81ee7f8..d1ec04e7 100644 --- a/game/app/style/main_theme.tres +++ b/game/app/style/main_theme.tres @@ -73,11 +73,11 @@ corner_radius_bottom_left = 18 [sub_resource type="StyleBoxEmpty" id=33] [sub_resource type="StyleBoxFlat" id=42] -content_margin_left = 10.0 -content_margin_right = 10.0 -content_margin_top = 10.0 -content_margin_bottom = 10.0 -bg_color = Color( 0.246094, 0.246094, 0.246094, 1 ) +content_margin_left = 8.0 +content_margin_right = 8.0 +content_margin_top = 8.0 +content_margin_bottom = 8.0 +bg_color = Color( 0.133333, 0.133333, 0.133333, 1 ) [sub_resource type="StyleBoxFlat" id=41] bg_color = Color( 0.368627, 0.368627, 0.368627, 1 ) diff --git a/game/app/style/theme_game_card.tres b/game/app/style/theme_game_card.tres index 7b4839d8..23bad236 100644 --- a/game/app/style/theme_game_card.tres +++ b/game/app/style/theme_game_card.tres @@ -77,13 +77,9 @@ corner_radius_bottom_left = 18 [sub_resource type="StyleBoxFlat" id=36] content_margin_left = 12.0 content_margin_right = 12.0 -content_margin_top = 5.0 -content_margin_bottom = 5.0 -bg_color = Color( 0.14902, 0.14902, 0.14902, 1 ) -border_width_left = 1 -border_width_top = 1 -border_width_right = 1 -border_width_bottom = 1 +content_margin_top = 12.0 +content_margin_bottom = 12.0 +bg_color = Color( 0.2, 0.2, 0.2, 1 ) border_color = Color( 0.394531, 0.394531, 0.394531, 1 ) corner_radius_top_left = 1 corner_radius_top_right = 1 @@ -112,7 +108,7 @@ CheckBox/styles/hover = SubResource( 34 ) CheckBox/styles/hover_pressed = SubResource( 31 ) CheckBox/styles/normal = SubResource( 32 ) CheckBox/styles/pressed = SubResource( 33 ) -HBoxContainer/constants/separation = 3 +HBoxContainer/constants/separation = 5 MarginContainer/constants/margin_bottom = 12 MarginContainer/constants/margin_left = 12 MarginContainer/constants/margin_right = 12 @@ -120,4 +116,4 @@ MarginContainer/constants/margin_top = 12 OptionButton/constants/arrow_margin = 9 Panel/styles/panel = SubResource( 37 ) PanelContainer/styles/panel = SubResource( 36 ) -VBoxContainer/constants/separation = 3 +VBoxContainer/constants/separation = 5 diff --git a/game/app/style/title_font.tres b/game/app/style/title_font.tres index 53481756..1675a814 100644 --- a/game/app/style/title_font.tres +++ b/game/app/style/title_font.tres @@ -1,7 +1,7 @@ [gd_resource type="DynamicFont" load_steps=2 format=2] -[ext_resource path="res://shared/fonts/roboto_mono/static/roboto_mono_semi_bold.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://shared/fonts/roboto/roboto_black.ttf" type="DynamicFontData" id=1] [resource] -size = 30 +size = 26 font_data = ExtResource( 1 ) From c11f6c06065d3f6155592d92263a92bb159e0007 Mon Sep 17 00:00:00 2001 From: ASecondGuy Date: Fri, 1 Jul 2022 15:45:36 +0200 Subject: [PATCH 2/3] Disable bbcode for no reason --- game/app/scenes/game_card.gd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game/app/scenes/game_card.gd b/game/app/scenes/game_card.gd index 7b080ea3..e90e968d 100644 --- a/game/app/scenes/game_card.gd +++ b/game/app/scenes/game_card.gd @@ -51,12 +51,12 @@ func setup(game_config: ConfigFile): $PopupDialogInfo/VC/TitleSection/HC/HighScore.visible = false _label_title.text = game_name - _label_description.bbcode_text = game_description + _label_description.text = game_description _label_playtime.text = playtime_number _label_playtime_unit.text = playtime_unit _popup_label_title.text = game_name - _popup_label_description.bbcode_text = game_description + _popup_label_description.text = game_description _popup_label_author.text = game_config.get_value("game", "creator") _popup_label_version.text = game_config.get_value("game", "version") _popup_playtime.text = playtime_number From 02650fd33e46bd9f824b0f805078eb3c70eba84c Mon Sep 17 00:00:00 2001 From: ASecondGuy Date: Fri, 1 Jul 2022 16:02:39 +0200 Subject: [PATCH 3/3] fix theme even more --- game/app/scenes/game_card.tscn | 84 +++++++++++++++++----------------- game/app/scenes/menu.tscn | 72 +++++++++++++++++------------ game/app/style/main_theme.tres | 12 ++++- 3 files changed, 94 insertions(+), 74 deletions(-) diff --git a/game/app/scenes/game_card.tscn b/game/app/scenes/game_card.tscn index 6caa2a89..1ddbdfe7 100644 --- a/game/app/scenes/game_card.tscn +++ b/game/app/scenes/game_card.tscn @@ -28,10 +28,10 @@ font_data = ExtResource( 4 ) font_data = ExtResource( 2 ) [sub_resource type="StyleBoxFlat" id=23] -content_margin_left = 15.0 -content_margin_right = 15.0 -content_margin_top = 5.0 -content_margin_bottom = 5.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.203922, 0.2, 0.2, 1 ) [sub_resource type="StyleBoxFlat" id=16] @@ -39,10 +39,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_top = 5.0 -content_margin_bottom = 5.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 @@ -50,9 +50,9 @@ corner_radius_bottom_left = 1 [node name="GameCard" type="PanelContainer"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_right = -680.0 -margin_bottom = -389.0 -rect_min_size = Vector2( 320, 180 ) +margin_right = -704.0 +margin_bottom = -413.0 +rect_min_size = Vector2( 320, 187 ) size_flags_horizontal = 0 size_flags_vertical = 0 theme = ExtResource( 7 ) @@ -61,12 +61,12 @@ script = ExtResource( 1 ) [node name="Card" type="VBoxContainer" parent="."] margin_left = 12.0 margin_top = 12.0 -margin_right = 332.0 -margin_bottom = 199.0 +margin_right = 308.0 +margin_bottom = 175.0 rect_min_size = Vector2( 296, 0 ) [node name="TitleSection" type="HBoxContainer" parent="Card"] -margin_right = 320.0 +margin_right = 296.0 margin_bottom = 64.0 custom_constants/separation = 10 @@ -82,7 +82,7 @@ __meta__ = { [node name="VC" type="VBoxContainer" parent="Card/TitleSection"] margin_left = 74.0 -margin_right = 320.0 +margin_right = 296.0 margin_bottom = 64.0 size_flags_horizontal = 3 __meta__ = { @@ -90,7 +90,7 @@ __meta__ = { } [node name="LabelTitle" type="Label" parent="Card/TitleSection/VC"] -margin_right = 246.0 +margin_right = 222.0 margin_bottom = 40.0 size_flags_vertical = 3 custom_fonts/font = SubResource( 1 ) @@ -102,7 +102,7 @@ __meta__ = { [node name="HC" type="HBoxContainer" parent="Card/TitleSection/VC"] margin_top = 45.0 -margin_right = 246.0 +margin_right = 222.0 margin_bottom = 64.0 custom_constants/separation = 4 __meta__ = { @@ -140,37 +140,37 @@ __meta__ = { [node name="Description" type="RichTextLabel" parent="Card"] margin_top = 69.0 -margin_right = 320.0 -margin_bottom = 147.0 +margin_right = 296.0 +margin_bottom = 123.0 size_flags_vertical = 3 bbcode_enabled = true [node name="ButtonSection" type="HBoxContainer" parent="Card"] -margin_top = 152.0 -margin_right = 320.0 -margin_bottom = 187.0 +margin_top = 128.0 +margin_right = 296.0 +margin_bottom = 163.0 alignment = 2 __meta__ = { "_edit_use_anchors_": false } [node name="ButtonInfo" type="Button" parent="Card/ButtonSection"] -margin_left = 159.0 -margin_right = 235.0 +margin_left = 135.0 +margin_right = 211.0 margin_bottom = 35.0 text = "T_INFO" [node name="ButtonPlay" type="Button" parent="Card/ButtonSection"] -margin_left = 240.0 -margin_right = 320.0 +margin_left = 216.0 +margin_right = 296.0 margin_bottom = 35.0 text = "T_PLAY" [node name="PopupDialogInfo" type="PopupDialog" parent="."] margin_left = 12.0 -margin_top = 10.0 +margin_top = 12.0 margin_right = 662.0 -margin_bottom = 410.0 +margin_bottom = 412.0 rect_min_size = Vector2( 650, 400 ) custom_styles/panel = SubResource( 22 ) __meta__ = { @@ -190,7 +190,7 @@ __meta__ = { [node name="TitleSection" type="PanelContainer" parent="PopupDialogInfo/VC"] material = SubResource( 20 ) margin_right = 650.0 -margin_bottom = 79.0 +margin_bottom = 88.0 __meta__ = { "_edit_lock_": true, "_edit_use_anchors_": false @@ -198,9 +198,9 @@ __meta__ = { [node name="HC" type="HBoxContainer" parent="PopupDialogInfo/VC/TitleSection"] margin_left = 12.0 -margin_top = 10.0 +margin_top = 12.0 margin_right = 638.0 -margin_bottom = 74.0 +margin_bottom = 76.0 alignment = 2 __meta__ = { "_edit_use_anchors_": false @@ -328,9 +328,9 @@ theme = ExtResource( 8 ) icon = ExtResource( 5 ) [node name="InfoSection" type="PanelContainer" parent="PopupDialogInfo/VC"] -margin_top = 79.0 +margin_top = 88.0 margin_right = 650.0 -margin_bottom = 355.0 +margin_bottom = 333.0 size_flags_vertical = 3 custom_styles/panel = SubResource( 23 ) __meta__ = { @@ -341,19 +341,19 @@ __meta__ = { margin_left = 15.0 margin_top = 5.0 margin_right = 635.0 -margin_bottom = 271.0 +margin_bottom = 240.0 custom_constants/separation = 16 [node name="Description" type="RichTextLabel" parent="PopupDialogInfo/VC/InfoSection/HC"] margin_right = 417.0 -margin_bottom = 266.0 +margin_bottom = 235.0 size_flags_horizontal = 3 bbcode_enabled = true [node name="VSeparator" type="VSeparator" parent="PopupDialogInfo/VC/InfoSection/HC"] margin_left = 433.0 margin_right = 437.0 -margin_bottom = 266.0 +margin_bottom = 235.0 custom_styles/separator = SubResource( 16 ) __meta__ = { "_edit_use_anchors_": false @@ -362,7 +362,7 @@ __meta__ = { [node name="VC" type="VBoxContainer" parent="PopupDialogInfo/VC/InfoSection/HC"] margin_left = 453.0 margin_right = 620.0 -margin_bottom = 266.0 +margin_bottom = 235.0 size_flags_horizontal = 3 size_flags_stretch_ratio = 0.4 @@ -418,16 +418,16 @@ __meta__ = { } [node name="PC3" type="PanelContainer" parent="PopupDialogInfo/VC"] -margin_top = 355.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 = 565.0 -margin_top = 5.0 -margin_right = 645.0 -margin_bottom = 40.0 +margin_left = 554.0 +margin_top = 16.0 +margin_right = 634.0 +margin_bottom = 51.0 size_flags_horizontal = 8 text = "T_PLAY" diff --git a/game/app/scenes/menu.tscn b/game/app/scenes/menu.tscn index 1a32b117..1d1838d5 100644 --- a/game/app/scenes/menu.tscn +++ b/game/app/scenes/menu.tscn @@ -77,17 +77,19 @@ __meta__ = { [node name="Games" type="VBoxContainer" parent="TabContainer"] anchor_right = 1.0 anchor_bottom = 1.0 +custom_constants/separation = 0 [node name="MC" type="MarginContainer" parent="TabContainer/Games"] margin_right = 1024.0 -margin_bottom = 55.0 +margin_bottom = 65.0 +rect_min_size = Vector2( 0, 65 ) size_flags_vertical = 0 [node name="Toolbar" type="HBoxContainer" parent="TabContainer/Games/MC"] margin_left = 15.0 -margin_top = 10.0 +margin_top = 15.0 margin_right = 1009.0 -margin_bottom = 45.0 +margin_bottom = 50.0 alignment = 2 [node name="Label" type="Label" parent="TabContainer/Games/MC/Toolbar"] @@ -114,25 +116,26 @@ __meta__ = { margin_left = 823.0 margin_right = 994.0 margin_bottom = 35.0 +size_flags_vertical = 5 text = "T_ALPHABETICAL" items = [ "T_LONGST_PLAYTIME", null, false, 0, null, "T_ALPHABETICAL", null, false, 1, null, "T_LAST_PLAYED", null, false, 2, null ] selected = 1 [node name="SC" type="ScrollContainer" parent="TabContainer/Games"] -margin_top = 60.0 +margin_top = 65.0 margin_right = 1024.0 margin_bottom = 543.0 size_flags_vertical = 3 [node name="MC" type="MarginContainer" parent="TabContainer/Games/SC"] margin_right = 30.0 -margin_bottom = 20.0 +margin_bottom = 30.0 [node name="GC" type="GridContainer" parent="TabContainer/Games/SC/MC"] margin_left = 15.0 -margin_top = 10.0 +margin_top = 15.0 margin_right = 15.0 -margin_bottom = 10.0 +margin_bottom = 15.0 custom_constants/vseparation = 4 custom_constants/hseparation = 4 columns = 3 @@ -178,30 +181,35 @@ T_PARTICIPATE_PLEASE_NOTE_1 T_PARTICIPATE_PLEASE_NOTE_2 T_PARTICIPATE_PLEASE_NOTE_3 T_REPORT_A_BUG_1 -[url=https://github.com/letsgamedev/Suffragium/issues/new/choose]Create an issue on Github [/url]" +[color=#26a8ff][url=https://github.com/letsgamedev/Suffragium/issues/new/choose]Create an issue on Github [/url][/color]" title_font = ExtResource( 4 ) [node name="MC" type="MarginContainer" parent="TabContainer/About"] margin_right = 1024.0 -margin_bottom = 634.0 +margin_bottom = 829.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="RichTextLabel" type="RichTextLabel" parent="TabContainer/About/MC"] margin_left = 15.0 -margin_top = 10.0 +margin_top = 15.0 margin_right = 1009.0 -margin_bottom = 624.0 +margin_bottom = 814.0 size_flags_horizontal = 3 size_flags_vertical = 3 bbcode_enabled = true text = "T_ABOUT_SUFFRAGIUM + T_ABOUT_SUFFRAGIUM_1 T_ABOUT_SUFFRAGIUM_2 + + T_PARTICIPATE + T_PARTICIPATE_1 +T_PARTICIPATE_PLEASE_NOTE T_PARTICIPATE_PLEASE_NOTE_1 T_PARTICIPATE_PLEASE_NOTE_2 T_PARTICIPATE_PLEASE_NOTE_3 @@ -217,7 +225,11 @@ Contributing to Suffragium How to add a game T_ABOUT_SUFFRAGIUM + + T_REPORT_A_BUG + +T_PARTICIPATE_PLEASE_NOTE T_PARTICIPATE_PLEASE_NOTE_1 T_PARTICIPATE_PLEASE_NOTE_2 T_PARTICIPATE_PLEASE_NOTE_3 @@ -235,35 +247,35 @@ script = ExtResource( 7 ) [node name="MC" type="MarginContainer" parent="TabContainer/Settings"] margin_right = 1024.0 -margin_bottom = 209.0 +margin_bottom = 232.0 size_flags_horizontal = 3 [node name="VC" type="VBoxContainer" parent="TabContainer/Settings/MC"] margin_left = 15.0 -margin_top = 10.0 +margin_top = 15.0 margin_right = 1009.0 -margin_bottom = 199.0 +margin_bottom = 217.0 [node name="Label" type="Label" parent="TabContainer/Settings/MC/VC"] -margin_right = 1014.0 -margin_bottom = 41.0 +margin_right = 994.0 +margin_bottom = 32.0 custom_fonts/font = ExtResource( 4 ) text = "T_SETTINGS" [node name="MarginContainer" type="MarginContainer" parent="TabContainer/Settings/MC/VC"] -margin_top = 45.0 -margin_right = 1014.0 -margin_bottom = 66.0 +margin_top = 37.0 +margin_right = 994.0 +margin_bottom = 68.0 custom_constants/margin_top = 16 __meta__ = { "_edit_use_anchors_": false } [node name="VC" type="VBoxContainer" parent="TabContainer/Settings/MC/VC"] -margin_left = 357.0 -margin_top = 70.0 -margin_right = 657.0 -margin_bottom = 187.0 +margin_left = 347.0 +margin_top = 73.0 +margin_right = 647.0 +margin_bottom = 202.0 rect_min_size = Vector2( 300, 0 ) size_flags_horizontal = 4 size_flags_vertical = 0 @@ -279,19 +291,19 @@ text = "T_RESET_TO_DEFAULTS" [node name="HSeparator" type="HSeparator" parent="TabContainer/Settings/MC/VC/VC"] margin_top = 43.0 margin_right = 300.0 -margin_bottom = 47.0 +margin_bottom = 59.0 __meta__ = { "_edit_use_anchors_": false } [node name="Language" type="HBoxContainer" parent="TabContainer/Settings/MC/VC/VC"] -margin_top = 55.0 +margin_top = 67.0 margin_right = 300.0 -margin_bottom = 90.0 +margin_bottom = 102.0 [node name="Label" type="Label" parent="TabContainer/Settings/MC/VC/VC/Language"] margin_top = 8.0 -margin_right = 148.0 +margin_right = 147.0 margin_bottom = 27.0 size_flags_horizontal = 3 text = "T_LANGUAGE" @@ -306,12 +318,12 @@ __meta__ = { } [node name="SmoothScroll" type="HBoxContainer" parent="TabContainer/Settings/MC/VC/VC"] -margin_top = 98.0 +margin_top = 110.0 margin_right = 300.0 -margin_bottom = 117.0 +margin_bottom = 129.0 [node name="Label" type="Label" parent="TabContainer/Settings/MC/VC/VC/SmoothScroll"] -margin_right = 280.0 +margin_right = 279.0 margin_bottom = 19.0 size_flags_horizontal = 3 text = "T_SMOOTH_SCROLLING" diff --git a/game/app/style/main_theme.tres b/game/app/style/main_theme.tres index d1ec04e7..f88d0782 100644 --- a/game/app/style/main_theme.tres +++ b/game/app/style/main_theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=22 format=2] +[gd_resource type="Theme" load_steps=23 format=2] [ext_resource path="res://shared/fonts/roboto/roboto_regular.ttf" type="DynamicFontData" id=1] @@ -72,6 +72,10 @@ corner_radius_bottom_left = 18 [sub_resource type="StyleBoxEmpty" id=33] +[sub_resource type="StyleBoxFlat" id=43] +border_width_top = 2 +border_color = Color( 0.266667, 0.266667, 0.266667, 1 ) + [sub_resource type="StyleBoxFlat" id=42] content_margin_left = 8.0 content_margin_right = 8.0 @@ -148,10 +152,12 @@ CheckBox/styles/hover_pressed = SubResource( 31 ) CheckBox/styles/normal = SubResource( 32 ) CheckBox/styles/pressed = SubResource( 33 ) HBoxContainer/constants/separation = 5 +HSeparator/constants/separation = 16 +HSeparator/styles/separator = SubResource( 43 ) MarginContainer/constants/margin_bottom = 15 MarginContainer/constants/margin_left = 15 MarginContainer/constants/margin_right = 15 -MarginContainer/constants/margin_top = 0 +MarginContainer/constants/margin_top = 15 OptionButton/constants/arrow_margin = 9 PanelContainer/styles/panel = SubResource( 42 ) PopupMenu/styles/hover = SubResource( 41 ) @@ -162,3 +168,5 @@ VScrollBar/styles/grabber_highlight = SubResource( 36 ) VScrollBar/styles/grabber_pressed = SubResource( 37 ) VScrollBar/styles/scroll = SubResource( 38 ) VScrollBar/styles/scroll_focus = SubResource( 39 ) +VSeparator/constants/separation = 0 +VSeparator/styles/separator = null