Changed: Temp Fix Board Dim
This commit is contained in:
@@ -109,9 +109,6 @@ public class GUI extends Application implements IView {
|
||||
double h = primaryStage.getHeight();
|
||||
primaryStage.setWidth(w);
|
||||
primaryStage.setHeight(h);
|
||||
primaryStage.setMinHeight(h);
|
||||
primaryStage.setMinWidth(w);
|
||||
primaryStage.setResizable(false);
|
||||
primaryStage.setScene(mainScene);
|
||||
controllerMain.render();
|
||||
}
|
||||
|
||||
@@ -41,6 +41,7 @@ import java.util.*;
|
||||
|
||||
public class MainFXMLController {
|
||||
|
||||
@FXML private GridPane leftGrid;
|
||||
@FXML private ScrollPane playerSide;
|
||||
@FXML private HBox mainHBox;
|
||||
@FXML private ImageView backgroundImage;
|
||||
@@ -157,7 +158,7 @@ public class MainFXMLController {
|
||||
// ==== ELEMENTS ====
|
||||
private StackPane createOrder(String num) {
|
||||
ImageView img = new ImageView(loadImage("/GUIImages/Orders/order-" + num + ".png"));
|
||||
img.fitHeightProperty().bind(board.heightProperty().multiply(0.94));
|
||||
img.fitHeightProperty().bind(board.sceneProperty().get().heightProperty().subtract(40).divide(4).multiply(0.94));
|
||||
img.setPreserveRatio(true);
|
||||
addClip(img);
|
||||
return new StackPane(img);
|
||||
@@ -166,7 +167,7 @@ public class MainFXMLController {
|
||||
private StackPane createSlot(Slot slot, boolean withZoom, boolean withShadow) {
|
||||
ImageView img = new ImageView(loadImage("/GUIImages/Fronts/card-" + slot.getSlotId() + ".png"));
|
||||
img.setPreserveRatio(true);
|
||||
img.fitHeightProperty().bind(board.heightProperty().multiply(0.94)); // TODO perchè è tutto moltiplicato per una costante ma in board facciamo -15?
|
||||
img.fitHeightProperty().bind(board.sceneProperty().get().heightProperty().subtract(40).divide(4).multiply(0.94)); // TODO perchè è tutto moltiplicato per una costante ma in board facciamo -15?
|
||||
addClip(img);
|
||||
StackPane wrapper = new StackPane(img);
|
||||
|
||||
@@ -188,7 +189,7 @@ public class MainFXMLController {
|
||||
private StackPane createCard(PlayableCard card, boolean withZoom, boolean withShadow, Region parent) {
|
||||
ImageView img = new ImageView(loadImage("/GUIImages/Fronts/card-" + card.getIdIMG() + ".png"));
|
||||
img.setPreserveRatio(true);
|
||||
img.fitHeightProperty().bind(parent.heightProperty().multiply(0.90));
|
||||
img.fitHeightProperty().bind(parent.getScene().heightProperty().subtract(40).divide(4).multiply(0.90));
|
||||
addClip(img);
|
||||
StackPane wrapper = new StackPane(img);
|
||||
if (withShadow) addShadow(wrapper);
|
||||
@@ -458,7 +459,7 @@ public class MainFXMLController {
|
||||
default -> "/GUIImages/Backs/back-001.png";
|
||||
};
|
||||
ImageView back = new ImageView(loadImage(path));
|
||||
back.fitHeightProperty().bind(board.heightProperty().multiply(0.94));
|
||||
back.fitHeightProperty().bind(board.sceneProperty().get().heightProperty().divide(4).multiply(0.94));
|
||||
back.setPreserveRatio(true);
|
||||
addClip(back);
|
||||
addShadow(back);
|
||||
|
||||
@@ -13,78 +13,78 @@
|
||||
fx:controller="it.polimi.ingsw.gc14.View.GUI.MainFXMLController"
|
||||
stylesheets="@styles.css">
|
||||
|
||||
<children>
|
||||
<!-- VBox sinistra: si espande per riempire tutto lo spazio disponibile -->
|
||||
<VBox alignment="CENTER"
|
||||
fillWidth="false"
|
||||
maxHeight="Infinity"
|
||||
maxWidth="Infinity"
|
||||
HBox.hgrow="ALWAYS">
|
||||
<HBox.margin>
|
||||
<Insets top="5" right="5" bottom="5" left="5" />
|
||||
</HBox.margin>
|
||||
<children>
|
||||
<HBox fx:id="upperList" styleClass="card-list" VBox.vgrow="ALWAYS">
|
||||
<VBox.margin>
|
||||
<Insets top="5" right="5" bottom="5" left="5" />
|
||||
</VBox.margin>
|
||||
</HBox>
|
||||
<children>
|
||||
<!-- VBox sinistra: si espande per riempire tutto lo spazio disponibile -->
|
||||
<VBox alignment="CENTER"
|
||||
fillWidth="false"
|
||||
maxHeight="Infinity"
|
||||
maxWidth="Infinity"
|
||||
HBox.hgrow="ALWAYS">
|
||||
<HBox.margin>
|
||||
<Insets top="5" right="5" bottom="5" left="5" />
|
||||
</HBox.margin>
|
||||
<children>
|
||||
<HBox fx:id="upperList" styleClass="card-list" VBox.vgrow="ALWAYS">
|
||||
<VBox.margin>
|
||||
<Insets top="5" right="5" bottom="5" left="5" />
|
||||
</VBox.margin>
|
||||
</HBox>
|
||||
|
||||
<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>
|
||||
</HBox>
|
||||
<HBox fx:id="board" styleClass="card-list" VBox.vgrow="NEVER">
|
||||
<VBox.margin>
|
||||
<Insets top="5" right="5" bottom="5" left="5" />
|
||||
</VBox.margin>
|
||||
</HBox>
|
||||
|
||||
<HBox fx:id="lowerList" styleClass="card-list" VBox.vgrow="ALWAYS">
|
||||
<VBox.margin>
|
||||
<Insets top="5" right="5" bottom="5" left="5" />
|
||||
</VBox.margin>
|
||||
</HBox>
|
||||
<HBox fx:id="lowerList" styleClass="card-list" VBox.vgrow="ALWAYS">
|
||||
<VBox.margin>
|
||||
<Insets top="5" right="5" bottom="5" left="5" />
|
||||
</VBox.margin>
|
||||
</HBox>
|
||||
|
||||
<HBox fx:id="myHand" styleClass="card-list" VBox.vgrow="ALWAYS">
|
||||
<VBox.margin>
|
||||
<Insets top="5" right="5" bottom="5" left="5" />
|
||||
</VBox.margin>
|
||||
</HBox>
|
||||
</children>
|
||||
</VBox>
|
||||
<!-- VBox destra: dimensione fissa, non si espande -->
|
||||
<VBox fx:id="sidePanel"
|
||||
prefWidth="250.0"
|
||||
maxWidth="250.0"
|
||||
minWidth="250.0"
|
||||
HBox.hgrow="NEVER"
|
||||
styleClass="side-panel">
|
||||
<HBox.margin>
|
||||
<Insets bottom="10" left="10" right="10" top="10" />
|
||||
</HBox.margin>
|
||||
<children>
|
||||
<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"/>
|
||||
<Button fx:id="detailsBtn" styleClass="action-button" text="Ending Details"/>
|
||||
</HBox>
|
||||
<VBox.margin>
|
||||
<Insets top="5" right="5" bottom="5" left="5"/>
|
||||
</VBox.margin>
|
||||
<HBox fx:id="myHand" styleClass="card-list" VBox.vgrow="ALWAYS">
|
||||
<VBox.margin>
|
||||
<Insets top="5" right="5" bottom="5" left="5" />
|
||||
</VBox.margin>
|
||||
</HBox>
|
||||
</children>
|
||||
</VBox>
|
||||
<!-- VBox destra: dimensione fissa, non si espande -->
|
||||
<VBox fx:id="sidePanel"
|
||||
prefWidth="250.0"
|
||||
maxWidth="250.0"
|
||||
minWidth="250.0"
|
||||
HBox.hgrow="NEVER"
|
||||
styleClass="side-panel">
|
||||
<HBox.margin>
|
||||
<Insets bottom="10" left="10" right="10" top="10" />
|
||||
</HBox.margin>
|
||||
<children>
|
||||
<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"/>
|
||||
<Button fx:id="detailsBtn" styleClass="action-button" text="Ending Details"/>
|
||||
</HBox>
|
||||
<VBox.margin>
|
||||
<Insets top="5" right="5" bottom="5" left="5"/>
|
||||
</VBox.margin>
|
||||
|
||||
</HBox>
|
||||
</HBox>
|
||||
|
||||
|
||||
</children>
|
||||
</VBox>
|
||||
</children>
|
||||
</VBox>
|
||||
|
||||
</children>
|
||||
</children>
|
||||
</HBox>
|
||||
Reference in New Issue
Block a user