From e372f91f28f4a0a70c29fb280d1a39de5f7f7fe1 Mon Sep 17 00:00:00 2001
From: Roar <roaraf@stud.ntnu.no>
Date: Fri, 17 Apr 2026 13:56:03 +0200
Subject: [PATCH] Updated charityPage.fxml

Fixed key value labels so they don't get cut off. They should now display in full.
---
 .../src/main/resources/fxml/charityPage.fxml  | 135 ++++++++++--------
 1 file changed, 73 insertions(+), 62 deletions(-)

diff --git a/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml b/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
index 130f321..7904ae7 100644
--- a/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
+++ b/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
@@ -120,6 +120,7 @@
 
                 <rowConstraints>
                     <RowConstraints vgrow="ALWAYS" />
+                    <RowConstraints />
                 </rowConstraints>
 
                 <GridPane prefHeight="791.0" prefWidth="0.0" style="-fx-background-color: #F5F5F5;" GridPane.rowIndex="0">
@@ -169,7 +170,7 @@
                     </GridPane>
                     <VBox alignment="CENTER" prefHeight="509.0" prefWidth="425.0" spacing="15.0" GridPane.rowIndex="1">
 
-                        <Hyperlink fx:id="CharityURL" text="Homepage" onAction="#handleHomepageClick">
+                        <Hyperlink fx:id="CharityURL" onAction="#handleHomepageClick" text="Homepage">
                             <font>
                                 <Font name="System Bold" size="20.0" />
                             </font>
@@ -219,7 +220,7 @@
                     <StackPane prefHeight="210.0" prefWidth="420.0" style="-fx-background-color:#F5F5F5;" translateX="-70" GridPane.rowIndex="0">
 
                         <Rectangle arcHeight="25.0" arcWidth="25.0" fill="#F5F5F5" height="210.0" stroke="#8B8B8B" strokeType="INSIDE" translateY="100.0" width="420.0" />
-                        <ImageView fx:id="CharityLogo" fitHeight="150.0" fitWidth="220.0" pickOnBounds="true" preserveRatio="true" translateY="100.0"/>
+                        <ImageView fx:id="CharityLogo" fitHeight="150.0" fitWidth="220.0" pickOnBounds="true" preserveRatio="true" translateY="100.0" />
                         <GridPane.margin>
                             <Insets top="20.0" />
                         </GridPane.margin>
@@ -268,7 +269,7 @@
                         </columnConstraints>
 
                         <children>
-                            <GridPane hgap="10.0">
+                            <GridPane hgap="10.0" GridPane.hgrow="ALWAYS">
                                 <columnConstraints>
                                     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
                                     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -278,96 +279,106 @@
                                     <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
                                 </rowConstraints>
                                 <children>
-
-                                    <VBox alignment="CENTER_LEFT" spacing="12.0">
+                                    <HBox fillHeight="false" prefHeight="100.0" prefWidth="3000000.0" GridPane.hgrow="ALWAYS">
                                         <children>
-                                            <Label text="Innsamlingsprosent">
-                                                <font>
-                                                    <Font name="System Bold" size="16.0" />
-                                                </font>
-                                            </Label>
 
-                                            <StackPane alignment="CENTER" maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
+                                            <VBox alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minWidth="250.0" prefWidth="250.0" spacing="12.0" HBox.hgrow="SOMETIMES">
                                                 <children>
-
-                                                    <Pane maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
-                                                        <children>
-                                                            <Circle centerX="50.0" centerY="50.0" fill="TRANSPARENT" radius="38.0" stroke="#F1DADA" strokeWidth="8.0" />
-
-                                                            <Arc fx:id="keyValueInnsamlingArc" centerX="50.0" centerY="50.0" fill="TRANSPARENT" length="-350.64" radiusX="38.0" radiusY="38.0" startAngle="90.0" stroke="#D83A32" strokeLineCap="BUTT" strokeWidth="8.0" type="OPEN" />
-                                                        </children>
-                                                    </Pane>
-
-                                                    <Label fx:id="keyValueInnsamlingLabel" text="0,0%" StackPane.alignment="CENTER">
+                                                    <Label text="Innsamlingsprosent">
                                                         <font>
                                                             <Font name="System Bold" size="16.0" />
                                                         </font>
                                                     </Label>
 
-                                                </children>
-                                            </StackPane>
-                                        </children>
-                                    </VBox>
+                                                    <StackPane alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="300.0">
+                                                        <children>
 
-                                    <VBox alignment="CENTER" prefWidth="144.0" spacing="12.0" GridPane.columnIndex="1">
-                                        <children>
-                                            <Label text="Administrasjonsprosent">
-                                                <font>
-                                                    <Font name="System Bold" size="16.0" />
-                                                </font>
-                                            </Label>
+                                                            <Pane maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
+                                                                <children>
+                                                                    <Circle centerX="50.0" centerY="50.0" fill="TRANSPARENT" radius="38.0" stroke="#F1DADA" strokeWidth="8.0" />
 
-                                            <StackPane alignment="CENTER" maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
-                                                <children>
+                                                                    <Arc fx:id="keyValueInnsamlingArc" centerX="50.0" centerY="50.0" fill="TRANSPARENT" length="-350.64" radiusX="38.0" radiusY="38.0" startAngle="90.0" stroke="#D83A32" strokeLineCap="BUTT" strokeWidth="8.0" type="OPEN" />
+                                                                </children>
+                                                            </Pane>
 
-                                                    <Pane maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
-                                                        <children>
-                                                            <Circle centerX="50.0" centerY="50.0" fill="TRANSPARENT" radius="38.0" stroke="#F1DADA" strokeWidth="8.0" />
+                                                            <Label fx:id="keyValueInnsamlingLabel" minWidth="-Infinity" text="0,0%" StackPane.alignment="CENTER">
+                                                                <font>
+                                                                    <Font name="System Bold" size="16.0" />
+                                                                </font>
+                                                            </Label>
 
-                                                            <Arc fx:id="keyValueAdminArc" centerX="50.0" centerY="50.0" fill="TRANSPARENT" length="-11.52" radiusX="38.0" radiusY="38.0" startAngle="90.0" stroke="#D83A32" strokeLineCap="BUTT" strokeWidth="8.0" type="OPEN" />
                                                         </children>
-                                                    </Pane>
+                                                    </StackPane>
+                                                </children>
+                                                <padding>
+                                                    <Insets right="100.0" />
+                                                </padding>
+                                            </VBox>
 
-                                                    <Label fx:id="keyValueAdminLabel" text="0,0%" StackPane.alignment="CENTER">
+                                            <VBox alignment="CENTER" minWidth="300.0" prefWidth="300.0" spacing="12.0" HBox.hgrow="SOMETIMES">
+                                                <children>
+                                                    <Label text="Administrasjonsprosent" VBox.vgrow="ALWAYS">
                                                         <font>
                                                             <Font name="System Bold" size="16.0" />
                                                         </font>
                                                     </Label>
 
-                                                </children>
-                                            </StackPane>
-                                        </children>
-                                    </VBox>
+                                                    <StackPane alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="300.0" VBox.vgrow="ALWAYS">
+                                                        <children>
 
-                                    <VBox alignment="CENTER_RIGHT" spacing="12.0" GridPane.columnIndex="2">
-                                        <children>
-                                            <Label text="Formålsprosent">
-                                                <font>
-                                                    <Font name="System Bold" size="16.0" />
-                                                </font>
-                                            </Label>
+                                                            <Pane maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
+                                                                <children>
+                                                                    <Circle centerX="50.0" centerY="50.0" fill="TRANSPARENT" radius="38.0" stroke="#F1DADA" strokeWidth="8.0" />
 
-                                            <StackPane alignment="CENTER" maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
-                                                <children>
+                                                                    <Arc fx:id="keyValueAdminArc" centerX="50.0" centerY="50.0" fill="TRANSPARENT" length="-11.52" radiusX="38.0" radiusY="38.0" startAngle="90.0" stroke="#D83A32" strokeLineCap="BUTT" strokeWidth="8.0" type="OPEN" />
+                                                                </children>
+                                                            </Pane>
 
-                                                    <Pane maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
-                                                        <children>
-                                                            <Circle centerX="50.0" centerY="50.0" fill="TRANSPARENT" radius="38.0" stroke="#F1DADA" strokeWidth="8.0" />
+                                                            <Label fx:id="keyValueAdminLabel" text="0,0%" StackPane.alignment="CENTER">
+                                                                <font>
+                                                                    <Font name="System Bold" size="16.0" />
+                                                                </font>
+                                                            </Label>
 
-                                                            <Arc fx:id="keyValueFormaalArc" centerX="50.0" centerY="50.0" fill="TRANSPARENT" length="-335.88" radiusX="38.0" radiusY="38.0" startAngle="90.0" stroke="#D83A32" strokeLineCap="BUTT" strokeWidth="8.0" type="OPEN" />
                                                         </children>
-                                                    </Pane>
+                                                    </StackPane>
+                                                </children>
+                                                <padding>
+                                                    <Insets right="100.0" />
+                                                </padding>
+                                            </VBox>
 
-                                                    <Label fx:id="keyValueFormaalLabel" text="0" StackPane.alignment="CENTER">
+                                            <VBox alignment="CENTER_RIGHT" minWidth="120.0" prefWidth="350.0" spacing="12.0" HBox.hgrow="SOMETIMES">
+                                                <children>
+                                                    <Label text="Formålsprosent" VBox.vgrow="ALWAYS">
                                                         <font>
                                                             <Font name="System Bold" size="16.0" />
                                                         </font>
                                                     </Label>
 
+                                                    <StackPane alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="300.0" VBox.vgrow="ALWAYS">
+                                                        <children>
+
+                                                            <Pane maxHeight="100.0" maxWidth="100.0" minHeight="100.0" minWidth="100.0" prefHeight="100.0" prefWidth="100.0">
+                                                                <children>
+                                                                    <Circle centerX="50.0" centerY="50.0" fill="TRANSPARENT" radius="38.0" stroke="#F1DADA" strokeWidth="8.0" />
+
+                                                                    <Arc fx:id="keyValueFormaalArc" centerX="50.0" centerY="50.0" fill="TRANSPARENT" length="-335.88" radiusX="38.0" radiusY="38.0" startAngle="90.0" stroke="#D83A32" strokeLineCap="BUTT" strokeWidth="8.0" type="OPEN" />
+                                                                </children>
+                                                            </Pane>
+
+                                                            <Label fx:id="keyValueFormaalLabel" text="0,0%" StackPane.alignment="CENTER">
+                                                                <font>
+                                                                    <Font name="System Bold" size="16.0" />
+                                                                </font>
+                                                            </Label>
+
+                                                        </children>
+                                                    </StackPane>
                                                 </children>
-                                            </StackPane>
+                                            </VBox>
                                         </children>
-                                    </VBox>
+                                    </HBox>
                                 </children>
                             </GridPane>
 
@@ -379,7 +390,7 @@
 
                 </GridPane>
 
-                <Label fx:id="CharityName" prefHeight="90.0" prefWidth="456.0" maxWidth="1000" style="-fx-text-fill:#2D3C8F;" text="[Charity Name]" textAlignment="CENTER" translateY="-420.0" GridPane.rowIndex="0" GridPane.rowSpan="2" GridPane.columnSpan="2">
+                <Label fx:id="CharityName" maxWidth="1000" prefHeight="90.0" prefWidth="456.0" style="-fx-text-fill:#2D3C8F;" text="[Charity Name]" textAlignment="CENTER" translateY="-420.0" GridPane.columnSpan="2" GridPane.rowIndex="0" GridPane.rowSpan="2">
 
                     <font>
                         <Font name="System Bold" size="50.0" />