Merge pull request #118 from charltonator/master

Wrap text in result box and add a bit more padding within each person card
AY2122S1-CS2103T-W12-4 · Oct 28, 2021 · 87409a3 · 87409a3
2 parents f8eb309 + 5b9005b
commit 87409a3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/seedu/modulink/Main.java b/src/main/java/seedu/modulink/Main.java
@@ -24,8 +24,6 @@ public class Main {
  * @param args parameter for main method.
  */
  public static void main(String[] args) {
-
- assert false;
  Application.launch(MainApp.class, args);
  }
 }
diff --git a/src/main/java/seedu/modulink/ui/PersonListPanel.java b/src/main/java/seedu/modulink/ui/PersonListPanel.java
@@ -42,9 +42,9 @@ protected void updateItem(Person person, boolean empty) {
  setText(null);
  } else if (person.getIsMyProfile()) {
  setGraphic(new PersonCard(person, getIndex() + 1).getRoot());
- setStyle("-fx-background-color: #228B22");
+ setStyle("-fx-background-color: #228B22; -fx-background-radius: 20px; -fx-padding: 10px");
  } else {
- setStyle("");
+ setStyle("-fx-background-radius: 20px; -fx-padding: 10px");
  setGraphic(new PersonCard(person, getIndex() + 1).getRoot());
 
  }

diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -41,7 +41,7 @@
  </StackPane>
 
  <StackPane VBox.vgrow="NEVER" fx:id="resultDisplayPlaceholder" styleClass="pane-with-border"
- minHeight="100" prefHeight="100" maxHeight="100">
+ minHeight="100" prefHeight="200" maxHeight="200">
  <padding>
  <Insets top="5" right="10" bottom="5" left="10" />
  </padding>

diff --git a/src/main/resources/view/ResultDisplay.fxml b/src/main/resources/view/ResultDisplay.fxml
@@ -5,5 +5,5 @@
 
 <StackPane fx:id="placeHolder" styleClass="pane-with-border" xmlns="http://javafx.com/javafx/8"
  xmlns:fx="http://javafx.com/fxml/1">
- <TextArea fx:id="resultDisplay" editable="false" styleClass="result-display"/>
+ <TextArea fx:id="resultDisplay" editable="false" styleClass="result-display" wrapText="true"/>
 </StackPane>