Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed: totem colors

Browse Source
This commit is contained in:
rubenpirreram
2026-05-15 16:55:23 +02:00
parent 45f7144121
commit 3199564292
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java
+4 -1
View File
@@ -258,7 +258,10 @@ public class ServerLauncher {
while (true) {
try{
this.doFirstEvent();
this.view.fullRender();
if(view!=null)
{
view.fullRender();
}
}
catch(InterruptedException e){
Thread.currentThread().interrupt();
src/main/java/it/polimi/ingsw/gc14/View/GUI/TotemFXMLController.java
+6 -6
View File
@@ -74,7 +74,7 @@ public class TotemFXMLController {
private void updateBanner(String chooser, boolean myTurn) {
if (myTurn) {
turnBanner.setText("✦ It's your turn to choice ✦");
turnBanner.setText("✦ It's your turn to choose ✦");
turnBanner.setStyle(
"-fx-font-family: 'Cinzel'; -fx-font-size: 13; -fx-letter-spacing: 3;" +
"-fx-text-fill: #000000;" +
@@ -85,7 +85,7 @@ public class TotemFXMLController {
"-fx-effect: dropshadow(gaussian, rgba(244,192,90,0.3), 18, 0, 0, 0);"
);
} else {
turnBanner.setText("Waiting " + chooser + " chooses his totem…");
turnBanner.setText("Waiting for" + chooser + " to choose his totem…");
turnBanner.setStyle(
"-fx-font-family: 'Cinzel'; -fx-font-size: 11; -fx-letter-spacing: 2;" +
"-fx-text-fill: #000000;" +
@@ -178,15 +178,15 @@ public class TotemFXMLController {
}
private String frameStyle(boolean selected) {
return "-fx-border-color: " + (selected ? "#f4c05a" : "rgba(200,120,20,0.28)") + ";" +
"-fx-border-width: " + (selected ? "2" : "0") + ";" +
return "-fx-border-color: " + (selected ? "#75FF79" : "rgba(200,120,20,0.28)") + ";" +
"-fx-border-width: " + (selected ? "0" : "0") + ";" +
"-fx-border-radius: 4 4 0 0; -fx-background-radius: 4 4 0 0;" +
(selected ? "-fx-effect: dropshadow(gaussian, rgba(244,192,90,0.35), 22, 0, 0, 0);" : "");
(selected ? "-fx-effect: dropshadow(gaussian, #ffffff, 20, 0.33, 0, 0);" : "");
}
private String nameStyle(boolean selected) {
return "-fx-font-family: 'Cinzel'; -fx-font-size: 10; -fx-letter-spacing: 2;" +
"-fx-text-fill: " + (selected ? "#f4c05a" : "ffffff") + ";";
"-fx-text-fill: " + (selected ? "#ffffff" : "ffffff") + ";";
}
private String capitalize(Totems t) {
src/main/resources/GUIScene/totem.fxml
+1 -1
View File
@@ -47,7 +47,7 @@
</Label>
<Label text="Choice your totem"
<Label text="Choose your totem"
style="-fx-font-family: 'Cinzel Decorative'; -fx-font-size: 30; -fx-font-weight: bold;
-fx-text-fill: #f4c05a;
-fx-effect: dropshadow(gaussian, rgba(244,192,90,0.4), 30, 0, 0, 0);">