steven/csep-2025
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix/ingredient-step-list-sizing' into 'main'

Browse source 
style(client): align ingredient and step list widths

Closes #48

See merge request cse1105/2025-2026/teams/csep-team-76!46
This commit is contained in:
Aysegul Aydinlik 2026-01-13 16:04:21 +01:00
commit 07d7e1b1a4
3 changed files with 47 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/src/main/resources/client/scenes/recipe/IngredientList.fxml
View file

@ -9,9 +9,10 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<AnchorPane xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.scenes.recipe.IngredientListCtrl">
<children>
<VBox minHeight="200.0" minWidth="200.0">
<VBox xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="client.scenes.recipe.IngredientListCtrl"
minHeight="200.0" minWidth="200.0" maxWidth="Infinity">
<children>
<HBox alignment="CENTER_LEFT" spacing="20.0">
<children>
@ -36,6 +37,4 @@
</HBox>
<ListView fx:id="ingredientListView" prefHeight="200.0" prefWidth="200.0" />
</children>
</VBox>
</children>
</AnchorPane>
</VBox>

6
client/src/main/resources/client/scenes/recipe/RecipeDetailView.fxml
View file

@ -28,8 +28,10 @@
</HBox>
<!-- Ingredients -->
<fx:include source="IngredientList.fxml" fx:id="ingredientList" />
<fx:include source="IngredientList.fxml" fx:id="ingredientList"
VBox.vgrow="ALWAYS" maxWidth="Infinity" />
<!-- Preparation -->
<fx:include source="RecipeStepList.fxml" fx:id="stepList" />
<fx:include source="RecipeStepList.fxml" fx:id="stepList"
VBox.vgrow="ALWAYS" maxWidth="Infinity" />
</VBox>

10
client/src/main/resources/client/scenes/recipe/RecipeStepList.fxml
View file

@ -9,9 +9,9 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<AnchorPane xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.scenes.recipe.RecipeStepListCtrl">
<children>
<VBox minHeight="200.0" minWidth="200.0">
<VBox xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="client.scenes.recipe.RecipeStepListCtrl"
minHeight="200.0" minWidth="200.0" maxWidth="Infinity">
<children>
<HBox alignment="CENTER_LEFT" spacing="20.0">
<children>
@ -36,6 +36,4 @@
</HBox>
<ListView fx:id="recipeStepListView" prefHeight="200.0" prefWidth="200.0" />
</children>
</VBox>
</children>
</AnchorPane>
</VBox>