Fixed: SkipTurn Botton Position, SidePanel position, Info back color changed

This commit is contained in:
rubenpirreram
2026-05-22 20:10:27 +02:00
parent 06c82bb085
commit 84a1f8de0f
4 changed files with 22 additions and 21 deletions
+1
View File
@@ -4,6 +4,7 @@
<inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
<option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.lang.foreign.Arena,ofAuto,java.lang.foreign.Arena,global,java.util.concurrent.Executors,newSingleThreadExecutor" />
</inspection_tool>
<inspection_tool class="CssInvalidPseudoSelector" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="MissingJavadoc" enabled="true" level="WARNING" enabled_by_default="true" />
</profile>
</component>
@@ -272,9 +272,9 @@ public class MainFXMLController {
private void renderPlayer(Player player,VBox target) {
VBox card = new VBox(3);
VBox.setMargin(card, new Insets(15,15,15,15));
VBox.setMargin(card, new Insets(0,15,0,15));
card.getStyleClass().add("player-card");
card.setPadding(new Insets(8));
card.setPadding(new Insets(4));
if(player.getUserName().equals(controller.miniModel.currentState.getCurrentPlayer().getUserName())) {
ScaleTransition scaleUp = new ScaleTransition(Duration.millis(150), card);
@@ -544,7 +544,7 @@ public class MainFXMLController {
addHoverZoom(skipBtn);
addHoverZoom(detailsBtn);
VBox playerList = new VBox();
VBox playerList = new VBox(17);
playerList.setFillWidth(true);
for (Player p : controller.miniModel.players.values()) {
renderPlayer(p, playerList);
@@ -630,7 +630,7 @@ public class MainFXMLController {
}
showPopup();
}
@FXML
private void openDetailsPopup() {
popupCards.getChildren().clear();
ImageView img = new ImageView(loadImage("/GUIImages/Backs/back-118.png"));
+15 -9
View File
@@ -5,6 +5,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.layout.Pane?>
<HBox fx:id="mainHBox"
maxHeight="Infinity" maxWidth="Infinity"
xmlns="http://javafx.com/javafx/26"
@@ -18,7 +19,7 @@
fillWidth="false"
maxHeight="Infinity"
maxWidth="Infinity"
HBox.hgrow="ALWAYS">
HBox.hgrow="NEVER">
<HBox.margin>
<Insets top="5" right="5" bottom="5" left="5" />
</HBox.margin>
@@ -29,7 +30,7 @@
</VBox.margin>
</HBox>
<HBox fx:id="board" prefHeight="300" minHeight="300" maxHeight="300" styleClass="card-list" VBox.vgrow="NEVER">
<HBox fx:id="board" prefHeight="280" minHeight="280" maxHeight="280" styleClass="card-list" VBox.vgrow="NEVER">
<VBox.margin>
<Insets top="5" right="5" bottom="5" left="5" />
</VBox.margin>
@@ -48,8 +49,7 @@
</HBox>
</children>
</VBox>
<!-- VBox destra: dimensione fissa, non si espande -->
<!-- VBox destra: dimensione fissa, non si espande -->
<VBox fx:id="sidePanel"
prefWidth="250.0"
maxWidth="250.0"
@@ -60,9 +60,17 @@
<Insets bottom="10" left="10" right="10" top="10" />
</HBox.margin>
<children>
<HBox fx:id="info" prefHeight="107.0" prefWidth="483.0" styleClass="frame" alignment="CENTER">
<HBox fx:id="info" prefHeight="80.0" prefWidth="483.0" styleClass="frame" alignment="CENTER">
<Label fx:id="infoText" styleClass="label-medium" text="VALORE" />
</HBox>
<ScrollPane fx:id="playerSide" fitToWidth="true"
style="-fx-background: transparent; -fx-background-color: transparent;" hbarPolicy="NEVER"
vbarPolicy="AS_NEEDED" VBox.vgrow="ALWAYS">
<VBox.margin>
<Insets top="5"/>
</VBox.margin>
</ScrollPane>
<Pane HBox.hgrow="ALWAYS"/>
<HBox alignment="CENTER" fx:id="buttonRow" >
<HBox spacing="10">
<Button fx:id="skipBtn" styleClass="action-button" text="Skip Turn"/>
@@ -73,10 +81,8 @@
</VBox.margin>
</HBox>
<ScrollPane fx:id="playerSide" fitToWidth="true"
style="-fx-background: transparent; -fx-background-color: transparent;" hbarPolicy="NEVER"
vbarPolicy="AS_NEEDED" VBox.vgrow="ALWAYS">
</ScrollPane>
</children>
</VBox>
+2 -8
View File
@@ -43,14 +43,8 @@
}
.frame {
-fx-background-color:
#8B6914,
#FFF8DC,
#8B6914,
#FFF8DC;
-fx-background-insets: 0, 5, 10, 15;
-fx-background-radius: 15, 12, 8, 4;
-fx-padding: 15 15 15 15;
-fx-background-color: rgba(255,255,255,0.35);
-fx-background-radius: 15 15 0 0;
}
.action-button {