Merge pull request #131 from DingBao-sys/MainWindowDesignBranch

Main window design branch
AY2324S2-CS2103T-T11-1 · Mar 31, 2024 · a7dc94b · a7dc94b
2 parents a1316cd + e181933
commit a7dc94b
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 20 deletions.
diff --git a/src/main/java/seedu/address/ui/PersonCard.java b/src/main/java/seedu/address/ui/PersonCard.java
@@ -70,7 +70,7 @@ private void fillAttributesBox() {
     public void setEmptyAttributeBox() {
         CustomPlaceholder emptyAttributePlaceholder =
                 new CustomPlaceholder("No Attributes Found", 20);
-        emptyAttributePlaceholder.setImageSize(120, 120);
+        emptyAttributePlaceholder.setImageSize(100, 100);
         personCardAttributes.getChildren().add(emptyAttributePlaceholder.getRoot());
     }
     /**

diff --git a/src/main/java/seedu/address/ui/personlistsection/AnyListSection.java b/src/main/java/seedu/address/ui/personlistsection/AnyListSection.java
@@ -3,7 +3,7 @@
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.relationship.Relationship;
 import seedu.address.ui.PersonList;
@@ -17,9 +17,9 @@ public class AnyListSection extends UiPart<Region> {
     private PersonList personList;
     private TreeMapFlowPane treeMapFlowPane;
     @FXML
-    private StackPane personListPlaceHolder;
+    private VBox personListPlaceHolder;
     @FXML
-    private StackPane treeMapPlaceHolder;
+    private VBox treeMapPlaceHolder;
 
     /**
      * Instantiates a anyListSection.

diff --git a/src/main/java/seedu/address/ui/personlistsection/TreeMapFlowPane.java b/src/main/java/seedu/address/ui/personlistsection/TreeMapFlowPane.java
@@ -7,7 +7,6 @@
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.Region;
-import javafx.scene.layout.VBox;
 import javafx.util.Duration;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.relationship.Relationship;
@@ -21,9 +20,6 @@
  */
 public class TreeMapFlowPane extends UiPart<Region> {
     private static final String FXML = "person-list-section/TreeMapPane.fxml";
-
-    @FXML
-    private VBox treeMapPaneContainer;
     @FXML
     private ScrollPane treeMapPaneScrollPane;
     @FXML
@@ -86,6 +82,7 @@ public void updateFlowPane(ObservableList<Person> persons, ObservableList<Relati
                         currentRelationship.getStyleDescriptor());
             }
         }
+        treeMapPaneScrollPane.setVvalue(0);
     }
 
     /**

diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.image.ImageView?>
 
 <fx:root type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
-         title="GENE-nie" minWidth="400" minHeight="850" onCloseRequest="#handleExit">
+         title="GENE-nie" minWidth="400" minHeight="900" onCloseRequest="#handleExit">
   <icons>
     <Image url="@/images/genie_32x32.png" />
   </icons>

diff --git a/src/main/resources/view/person-list-section/AnyListSection.fxml b/src/main/resources/view/person-list-section/AnyListSection.fxml
@@ -8,7 +8,7 @@
     <stylesheets>
         <URL value="@any-list-section.css" />
     </stylesheets>
-    <StackPane fx:id="treeMapPlaceHolder" styleClass="anyListSection_treeMapContainer" VBox.vgrow="NEVER"/>
-    <StackPane VBox.vgrow="ALWAYS" fx:id="personListPlaceHolder" styleClass="anyListSection_personListPlaceHolder"/>
+    <VBox fx:id="treeMapPlaceHolder" styleClass="anyListSection_treeMapContainer" VBox.vgrow="ALWAYS" alignment="CENTER"/>
+    <VBox fx:id="personListPlaceHolder" styleClass="anyListSection_personListPlaceHolder" VBox.vgrow="SOMETIMES"/>
 </VBox>
 
diff --git a/src/main/resources/view/person-list-section/TreeMapPane.fxml b/src/main/resources/view/person-list-section/TreeMapPane.fxml
@@ -6,12 +6,11 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.control.ScrollPane?>
 
-<VBox fx:id="treeMapPaneContainer" alignment="CENTER" xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1">
+<ScrollPane xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1" fitToWidth="true" fitToHeight="true" fx:id="treeMapPaneScrollPane" styleClass="treeMapPaneScrollPane">
     <stylesheets>
         <URL value="@tree-map.css" />
     </stylesheets>
-    <ScrollPane fitToWidth="true" fitToHeight="true" fx:id="treeMapPaneScrollPane" styleClass="treeMapPaneScrollPane">
         <FlowPane fx:id="treeMapPane" alignment="CENTER" hgap="8" vgap="8" styleClass="tree-map_flowpane">
         </FlowPane>
     </ScrollPane>
-</VBox>
+
diff --git a/src/main/resources/view/person-list-section/any-list-section.css b/src/main/resources/view/person-list-section/any-list-section.css
@@ -1,13 +1,10 @@
-.anyListSection_container {
-}
-
 .anyListSection_treeMapContainer {
     -fx-background-radius: 5;
     -fx-border-radius: 5;
-    -fx-min-height: 100;
-    -fx-max-height: 200;
     -fx-padding: 0 0 25 0;
     -fx-border-radius: 10;
+    -fx-min-height: 200;
+    -fx-pref-height: 350;
 }
 
 .anyListSection_personListPlaceHolder {

diff --git a/src/main/resources/view/person-list-section/tree-map.css b/src/main/resources/view/person-list-section/tree-map.css
@@ -4,7 +4,6 @@
 
 .treeMapPaneScrollPane {
     -fx-background-color: transparent;
-    -fx-fit-to-width: true;
 }
 
 .treeMapPaneScrollPane .scroll-bar:vertical .increment-arrow,