From 4f45417559086a952708cd9edd84793b1181d4ce Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.uni-bielefeld.de>
Date: Thu, 1 Feb 2024 10:29:28 +0100
Subject: [PATCH] Slight visual tweaks
---
.../gui_2d_vis/gui_theme.json | 28 +++++++++++++++++++
.../gui_2d_vis/overcooked_gui.py | 16 +++++------
2 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/overcooked_simulator/gui_2d_vis/gui_theme.json b/overcooked_simulator/gui_2d_vis/gui_theme.json
index 61a517d1..8e7e819a 100644
--- a/overcooked_simulator/gui_2d_vis/gui_theme.json
+++ b/overcooked_simulator/gui_2d_vis/gui_theme.json
@@ -129,5 +129,33 @@
"bold": 1,
"colour": "#000000"
}
+ },
+ "#multiple_keysets_button": {
+ "font": {
+ "size": 12,
+ "bold": 1,
+ "colour": "#000000"
+ }
+ },
+ "#split_players_button": {
+ "font": {
+ "size": 12,
+ "bold": 1,
+ "colour": "#000000"
+ }
+ },
+ "#controller_button": {
+ "font": {
+ "size": 12,
+ "bold": 1,
+ "colour": "#000000"
+ }
+ },
+ "#quantity_button": {
+ "font": {
+ "size": 24,
+ "bold": 1,
+ "colour": "#000000"
+ }
}
}
\ No newline at end of file
diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
index 8437aa59..3260d1ef 100644
--- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py
+++ b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
@@ -408,7 +408,7 @@ class PyGameGUI:
container=self.player_selection_container,
text="not set",
anchors={"left": "left", "centery": "centery"},
- object_id="#wasd",
+ object_id="#multiple_keysets_button",
)
split_players_button_rect = pygame.Rect((0, 0), (190, 50))
@@ -418,7 +418,7 @@ class PyGameGUI:
container=self.player_selection_container,
text="not set",
anchors={"centerx": "centerx", "centery": "centery"},
- object_id="#checkbox_split",
+ object_id="#split_players_button",
)
if self.multiple_keysets:
self.split_players_button.show()
@@ -433,7 +433,7 @@ class PyGameGUI:
container=self.player_selection_container,
text="Controller?",
anchors={"right": "right", "centery": "centery"},
- object_id="#controller",
+ object_id="#controller_button",
)
########
@@ -500,14 +500,14 @@ class PyGameGUI:
anchors={"center": "center"},
)
- size = 70
+ size = 50
add_player_button_rect = pygame.Rect((0, 0), (size, size))
add_player_button_rect.right = 0
self.add_human_player_button = pygame_gui.elements.UIButton(
relative_rect=add_player_button_rect,
text="+",
manager=self.manager,
- object_id="#add_player",
+ object_id="#quantity_button",
container=self.player_number_container,
anchors={"right": "right", "centery": "centery"},
)
@@ -519,7 +519,7 @@ class PyGameGUI:
relative_rect=remove_player_button_rect,
text="-",
manager=self.manager,
- object_id="#remove_player",
+ object_id="#quantity_button",
container=self.player_number_container,
anchors={"left": "left", "centery": "centery"},
)
@@ -531,7 +531,7 @@ class PyGameGUI:
relative_rect=add_bot_button_rect,
text="+",
manager=self.manager,
- object_id="#add_bot",
+ object_id="#quantity_button",
container=self.bot_number_container,
anchors={"right": "right", "centery": "centery"},
)
@@ -543,7 +543,7 @@ class PyGameGUI:
relative_rect=remove_bot_button_rect,
text="-",
manager=self.manager,
- object_id="#remove_bot",
+ object_id="#quantity_button",
container=self.bot_number_container,
anchors={"left": "left", "centery": "centery"},
)
--
GitLab