diff options
| author | tpart <tpart120@proton.me> | 2024-08-06 20:38:38 +0200 |
|---|---|---|
| committer | tpart <tpart120@proton.me> | 2024-08-06 20:38:38 +0200 |
| commit | bd2956b13e05ad43776f9e292abac65dba49293d (patch) | |
| tree | 3297dcbbf147c8a8920de2ea16053edd6670f5cc | |
| parent | ac79d7789c5a85b3ef195e421f1836a750fa9b6f (diff) | |
| download | hurrycurry-bd2956b13e05ad43776f9e292abac65dba49293d.tar hurrycurry-bd2956b13e05ad43776f9e292abac65dba49293d.tar.bz2 hurrycurry-bd2956b13e05ad43776f9e292abac65dba49293d.tar.zst | |
Fix: Credits menu not scrollable with touch and controller
| -rw-r--r-- | client/menu/credits.gd | 2 | ||||
| -rw-r--r-- | client/menu/credits.tscn | 13 | ||||
| -rw-r--r-- | client/menu/scroll_container_custom.gd | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/client/menu/credits.gd b/client/menu/credits.gd index 188cd415..a7474877 100644 --- a/client/menu/credits.gd +++ b/client/menu/credits.gd @@ -38,7 +38,7 @@ var credits := [ ]], ] -@onready var label = $OuterMargin/Panel/InnerMargin/Vert/CreditsText +@onready var label = $OuterMargin/Panel/InnerMargin/Vert/ScrollContainer/CreditsText func _ready(): super() diff --git a/client/menu/credits.tscn b/client/menu/credits.tscn index 9d7c4d28..657bfa44 100644 --- a/client/menu/credits.tscn +++ b/client/menu/credits.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=3 uid="uid://7mqbxa054bjv"] +[gd_scene load_steps=5 format=3 uid="uid://7mqbxa054bjv"] [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_16kk6"] [ext_resource type="Script" path="res://menu/credits.gd" id="2_alvab"] [ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_nwoiv"] +[ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="4_bfcw8"] [node name="CreditsMenu" type="Control"] layout_mode = 3 @@ -42,9 +43,15 @@ theme_override_constants/margin_bottom = 50 [node name="Vert" type="VBoxContainer" parent="OuterMargin/Panel/InnerMargin"] layout_mode = 2 -[node name="CreditsText" type="RichTextLabel" parent="OuterMargin/Panel/InnerMargin/Vert"] +[node name="ScrollContainer" type="ScrollContainer" parent="OuterMargin/Panel/InnerMargin/Vert"] layout_mode = 2 size_flags_vertical = 3 +script = ExtResource("4_bfcw8") + +[node name="CreditsText" type="RichTextLabel" parent="OuterMargin/Panel/InnerMargin/Vert/ScrollContainer"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 auto_translate = false theme_override_constants/table_h_separation = 25 theme_override_font_sizes/normal_font_size = 22 @@ -53,6 +60,8 @@ theme_override_font_sizes/italics_font_size = 22 theme_override_font_sizes/bold_italics_font_size = 22 theme_override_font_sizes/mono_font_size = 22 bbcode_enabled = true +fit_content = true +scroll_active = false [node name="back" type="Button" parent="OuterMargin/Panel/InnerMargin/Vert"] layout_mode = 2 diff --git a/client/menu/scroll_container_custom.gd b/client/menu/scroll_container_custom.gd index 5da95ac5..4908299e 100644 --- a/client/menu/scroll_container_custom.gd +++ b/client/menu/scroll_container_custom.gd @@ -16,7 +16,7 @@ extends ScrollContainer class_name ScrollContainerCustom -# Adds support for scrolling with joypad +# Adds support for scrolling with joypad and touch const SCROLL_SPEED := 1000. |