Show each player's picture first in the player list

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

data/settings.gd

@@ -37,6 +37,7 @@ const THEMES: Array[Dictionary] = [
 	{"id": "classic", "name": "Classic", "path": "res://themes/main_theme.tres"},
 	{"id": "original_web", "name": "Original web", "path": "res://themes/original_web_theme.tres"},
 	{"id": "nord", "name": "Nord", "path": "res://themes/nord_theme.tres"},
+	{"id": "christmas", "name": "Christmas", "path": "res://themes/christmas_theme.tres"},
 ]
 ## When this environment variable is set, the settings files are kept in that folder
 ## instead of the user's config folder. The tests set it so they never touch the real files.

quiz/PlayerRow.tscn

@@ -14,6 +14,23 @@ script = ExtResource("1_if4kc")
 layout_mode = 2
 theme_override_constants/separation = 8
 
+[node name="CharacterFrame" type="PanelContainer" parent="HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_vertical = 4
+theme_type_variation = &"PlayerCharacter"
+
+[node name="Character" type="TextureButton" parent="HBoxContainer/CharacterFrame"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(64, 32)
+layout_mode = 2
+tooltip_text = "Change character"
+focus_mode = 0
+action_mode = 0
+texture_normal = ExtResource("2_hpj3s")
+ignore_texture_size = true
+stretch_mode = 5
+
 [node name="Name" type="Label" parent="HBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
@@ -33,23 +50,6 @@ text = "0"
 horizontal_alignment = 2
 vertical_alignment = 1
 
-[node name="CharacterFrame" type="PanelContainer" parent="HBoxContainer"]
-unique_name_in_owner = true
-layout_mode = 2
-size_flags_vertical = 4
-theme_type_variation = &"PlayerCharacter"
-
-[node name="Character" type="TextureButton" parent="HBoxContainer/CharacterFrame"]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(64, 32)
-layout_mode = 2
-tooltip_text = "Change character"
-focus_mode = 0
-action_mode = 0
-texture_normal = ExtResource("2_hpj3s")
-ignore_texture_size = true
-stretch_mode = 5
-
 [node name="AddPoint" type="Button" parent="HBoxContainer"]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(40, 36)

tests/data/layout_baseline.json

@@ -5035,7 +5035,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     636.0,
     68.0,
     36.0
@@ -5044,7 +5044,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     638.0,
     64.0,
     32.0
@@ -5053,7 +5053,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     641.0,
     388.0,
     26.0
@@ -5080,7 +5080,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     637.0,
     40.0,
     34.0
@@ -5116,7 +5116,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#2/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     678.0,
     68.0,
     36.0
@@ -5125,7 +5125,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#2/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     680.0,
     64.0,
     32.0
@@ -5134,7 +5134,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#2/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     683.0,
     388.0,
     26.0
@@ -5161,7 +5161,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#2/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     679.0,
     40.0,
     34.0
@@ -5197,7 +5197,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#3/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     720.0,
     68.0,
     36.0
@@ -5206,7 +5206,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#3/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     722.0,
     64.0,
     32.0
@@ -5215,7 +5215,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#3/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     725.0,
     388.0,
     26.0
@@ -5242,7 +5242,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#3/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     721.0,
     40.0,
     34.0
@@ -5278,7 +5278,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#4/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     762.0,
     68.0,
     36.0
@@ -5287,7 +5287,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#4/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     764.0,
     64.0,
     32.0
@@ -5296,7 +5296,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#4/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     767.0,
     388.0,
     26.0
@@ -5323,7 +5323,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#4/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     763.0,
     40.0,
     34.0
@@ -5359,7 +5359,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     594.0,
     68.0,
     36.0
@@ -5368,7 +5368,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     596.0,
     64.0,
     32.0
@@ -5377,7 +5377,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     599.0,
     388.0,
     26.0
@@ -5404,7 +5404,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     595.0,
     40.0,
     34.0
@@ -11805,7 +11805,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     636.0,
     68.0,
     36.0
@@ -11814,7 +11814,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     638.0,
     64.0,
     32.0
@@ -11823,7 +11823,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     641.0,
     388.0,
     26.0
@@ -11850,7 +11850,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     637.0,
     40.0,
     34.0
@@ -11886,7 +11886,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     594.0,
     68.0,
     36.0
@@ -11895,7 +11895,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     596.0,
     64.0,
     32.0
@@ -11904,7 +11904,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     599.0,
     388.0,
     26.0
@@ -11931,7 +11931,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     595.0,
     40.0,
     34.0
@@ -15857,7 +15857,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     636.0,
     68.0,
     36.0
@@ -15866,7 +15866,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     638.0,
     64.0,
     32.0
@@ -15875,7 +15875,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     641.0,
     388.0,
     26.0
@@ -15902,7 +15902,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     637.0,
     40.0,
     34.0
@@ -15938,7 +15938,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     594.0,
     68.0,
     36.0
@@ -15947,7 +15947,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     596.0,
     64.0,
     32.0
@@ -15956,7 +15956,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     599.0,
     388.0,
     26.0
@@ -15983,7 +15983,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     595.0,
     40.0,
     34.0
@@ -37366,7 +37366,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     636.0,
     68.0,
     36.0
@@ -37375,7 +37375,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     638.0,
     64.0,
     32.0
@@ -37384,7 +37384,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     641.0,
     388.0,
     26.0
@@ -37411,7 +37411,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     637.0,
     40.0,
     34.0
@@ -37447,7 +37447,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     594.0,
     68.0,
     36.0
@@ -37456,7 +37456,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     596.0,
     64.0,
     32.0
@@ -37465,7 +37465,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     599.0,
     388.0,
     26.0
@@ -37492,7 +37492,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     595.0,
     40.0,
     34.0
@@ -42016,7 +42016,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     636.0,
     68.0,
     36.0
@@ -42025,7 +42025,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     638.0,
     64.0,
     32.0
@@ -42034,7 +42034,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     641.0,
     388.0,
     26.0
@@ -42061,7 +42061,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/#1/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     637.0,
     40.0,
     34.0
@@ -42097,7 +42097,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/CharacterFrame": {
    "rect": [
-    1676.0,
+    1232.0,
     594.0,
     68.0,
     36.0
@@ -42106,7 +42106,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/CharacterFrame/Character": {
    "rect": [
-    1678.0,
+    1234.0,
     596.0,
     64.0,
     32.0
@@ -42115,7 +42115,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/Name": {
    "rect": [
-    1232.0,
+    1308.0,
     599.0,
     388.0,
     26.0
@@ -42142,7 +42142,7 @@
   },
   "Quiz/PlayersPanel/VBoxContainer/ScrollContainer/PlayersListVBoxContainer/PlayerRow/HBoxContainer/Score": {
    "rect": [
-    1628.0,
+    1704.0,
     595.0,
     40.0,
     34.0

tests/integration/test_theme_picker.gd

@@ -27,7 +27,7 @@ func test_picker_lists_every_theme_and_shows_the_one_in_use() -> void:
 	for index: int in _settings.theme_button.item_count:
 		names.append(_settings.theme_button.get_item_text(index))
 
-	assert_array(names).contains_exactly(["Classic", "Original web", "Nord"])
+	assert_array(names).contains_exactly(["Classic", "Original web", "Nord", "Christmas"])
 	assert_str(_settings.theme_button.get_item_text(_settings.theme_button.selected)) \
 			.is_equal("Classic")
 

themes/README.md

@@ -9,6 +9,7 @@ font sizes or style boxes themselves; they name one of the theme's styles instea
 | Classic | `main_theme.tres` | The default. Also the project theme (Project Settings → GUI → Theme → Custom), which the editor shows |
 | Original web | `original_web_theme.tres` | Looks like MusicFrontend, the web version: orange-bordered buttons, `#333` header and popups, `#424242` panels, `#4e4e4e` alternating rows, a yellow playing song and a light grey player bar |
 | Nord | `nord_theme.tres` | Dark blues from the app icon (`#1e4a69` window, `#1a3e5a` panels, `#29577f` buttons) with Nord's Snow Storm text, Frost and Aurora accents: Aurora yellow `#EBCB8B` for the playing song and highlights. Round shapes: pill buttons and tabs, 14–16 px corners, soft shadows on popups, cards and the player bar, and rounded text fields |
+| Christmas | `christmas_theme.tres` | Santa and a Christmas tree: Christmas red (`#7a1520` window, `#5c0f18` panels) with snow white buttons and red text, a thick white "fur" trim on popups, cards, the lists and the player bar, the tree's green (`#1f6b3c`) for the chosen tab and the play button, and gold for the playing song and highlights. The same round shapes as Nord |
 
 ## Picking a theme