Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main window design branch #131

Merged
merged 3 commits into from
Mar 31, 2024
Merged

Main window design branch #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62e22ad
Fix TreeMapScroll Bug
DingBao-sys Mar 31, 2024
39f8c1f
fix uio bug
DingBao-sys Mar 31, 2024
e181933
fix uio bug
DingBao-sys Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/ui/PersonCard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
public void setEmptyAttributeBox() {
CustomPlaceholder emptyAttributePlaceholder =
new CustomPlaceholder("No Attributes Found", 20);
emptyAttributePlaceholder.setImageSize(120, 120);
emptyAttributePlaceholder.setImageSize(100, 100);

Check warning on line 73 in src/main/java/seedu/address/ui/PersonCard.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/seedu/address/ui/PersonCard.java#L73 

Added line #L73 was not covered by tests
personCardAttributes.getChildren().add(emptyAttributePlaceholder.getRoot());
}
/**
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/seedu/address/ui/personlistsection/AnyListSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/seedu/address/ui/personlistsection/TreeMapFlowPane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -86,6 +82,7 @@
currentRelationship.getStyleDescriptor());
}
}
treeMapPaneScrollPane.setVvalue(0);

Check warning on line 85 in src/main/java/seedu/address/ui/personlistsection/TreeMapFlowPane.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/seedu/address/ui/personlistsection/TreeMapFlowPane.java#L85 

Added line #L85 was not covered by tests
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/view/MainWindow.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/view/person-list-section/AnyListSection.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

5 changes: 2 additions & 3 deletions src/main/resources/view/person-list-section/TreeMapPane.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

7 changes: 2 additions & 5 deletions src/main/resources/view/person-list-section/any-list-section.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/view/person-list-section/tree-map.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

.treeMapPaneScrollPane {
-fx-background-color: transparent;
-fx-fit-to-width: true;
}

.treeMapPaneScrollPane .scroll-bar:vertical .increment-arrow,
Expand Down
Loading