Merge pull request #336 from nhamhung/Update-Ui-for-text-overflow

Update ui for text overflow
AY1920S2-CS2103T-F10-1 · Apr 13, 2020 · 7df82aa · 7df82aa
2 parents 2c22a37 + 59935c7
commit 7df82aa
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 47 deletions.
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
@@ -329,12 +329,13 @@
 }
 
 .scroll-bar .increment-button, .scroll-bar .decrement-button {
-    -fx-background-color:transparent !important;
+    -fx-background-color:transparent;
     -fx-padding: 0 0 0 0;
 }
 
 .scroll-bar .increment-arrow, .scroll-bar .decrement-arrow {
     -fx-shape: " ";
+    -fx-padding:0;
 }
 
 .scroll-bar:vertical .increment-arrow, .scroll-bar:vertical .decrement-arrow {
@@ -432,14 +433,6 @@
     -fx-background-color: transparent !important;
 }
 
-.scroll-pane .corner {
-    -fx-background-color: black;
-}
-
-.scroll-bar .corner {
-    -fx-background-color: black;
-}
-
 .user {
     -fx-background: transparent !important;
     -fx-background-color: transparent !important;

diff --git a/src/main/resources/view/ItemListPanel.fxml b/src/main/resources/view/ItemListPanel.fxml
@@ -8,32 +8,32 @@
 
 <VBox xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
 
-  <HBox alignment="CENTER">
-    <Label fx:id="internshipLabel" styleClass="typeNotSelected" text="Internship">
+  <HBox alignment="CENTER" VBox.vgrow="NEVER">
+    <Label fx:id="internshipLabel" styleClass="typeNotSelected" text="Internship" HBox.hgrow="NEVER">
       <padding>
         <Insets bottom="5" left="10" right="10" top="5" />
       </padding>
       <HBox.margin>
         <Insets right="5" />
       </HBox.margin>
     </Label>
-    <Label fx:id="skillLabel" styleClass="typeNotSelected" text="Skill">
+    <Label fx:id="skillLabel" styleClass="typeNotSelected" text="Skill" HBox.hgrow="NEVER">
       <padding>
         <Insets bottom="5" left="10" right="10" top="5" />
       </padding>
       <HBox.margin>
         <Insets right="5" />
       </HBox.margin>
     </Label>
-    <Label fx:id="projectLabel" styleClass="typeNotSelected" text="Project">
+    <Label fx:id="projectLabel" styleClass="typeNotSelected" text="Project" HBox.hgrow="NEVER">
       <padding>
         <Insets bottom="5" left="10" right="10" top="5" />
       </padding>
       <HBox.margin>
         <Insets right="5" />
       </HBox.margin>
     </Label>
-    <Label fx:id="resumeLabel" styleClass="typeNotSelected" text="Resume">
+    <Label fx:id="resumeLabel" styleClass="typeNotSelected" text="Resume" HBox.hgrow="NEVER">
       <padding>
         <Insets bottom="5" left="10" right="10" top="5" />
       </padding>

diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.stage.Stage?>
 
-<fx:root maxWidth="1450" minHeight="600" minWidth="1000" onCloseRequest="#handleExit" title="ResuMe" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root minHeight="600" minWidth="1000" onCloseRequest="#handleExit" title="ResuMe" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
   <icons>
     <Image url="@/images/address_book_32.png" />
   </icons>
@@ -34,9 +34,9 @@
         </MenuBar>
             <HBox fx:id="mainContainer" minWidth="700" styleClass="pane-with-border" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS">
                <children>
-                  <VBox fx:id="userExperiencePlaceholder" maxWidth="350.0" minWidth="330.0" styleClass="pane-with-border">
+                  <VBox fx:id="userExperiencePlaceholder" maxWidth="350.0" minWidth="330.0" styleClass="pane-with-border" HBox.hgrow="ALWAYS">
                      <children>
-                        <StackPane fx:id="profilePlaceholder" styleClass="pane-with-border" />
+                        <StackPane fx:id="profilePlaceholder" maxHeight="90.0" styleClass="pane-with-border" VBox.vgrow="ALWAYS" />
                         <StackPane fx:id="notePlaceholder" styleClass="pane-with-border" VBox.vgrow="ALWAYS" />
                      </children>
                   </VBox>
@@ -51,7 +51,7 @@
                        <items>
                           <VBox fx:id="resultAndItem">
                              <children>
-                             <StackPane fx:id="resultDisplayPlaceholder" maxHeight="250.0" minWidth="300.0">
+                             <StackPane fx:id="resultDisplayPlaceholder" maxHeight="250.0" minWidth="300.0" VBox.vgrow="ALWAYS">
                              </StackPane>
                              <StackPane fx:id="itemDisplayPlaceholder" minWidth="300.0" styleClass="pane-with-border" VBox.vgrow="ALWAYS">
                                  <VBox.margin>

diff --git a/src/main/resources/view/NoteCard.fxml b/src/main/resources/view/NoteCard.fxml
@@ -12,27 +12,27 @@
 
 <HBox id="noteCardPane" stylesheets="@NoteCard.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <VBox id="indexBox" prefHeight="40.0" prefWidth="40.0">
+      <VBox id="indexBox" prefHeight="40.0" prefWidth="40.0" HBox.hgrow="NEVER">
          <children>
-            <Label id="index" fx:id="id" alignment="CENTER" contentDisplay="CENTER" prefHeight="40.0" prefWidth="40.0" text="\\\$index" textAlignment="CENTER">
+            <Label id="index" fx:id="id" alignment="CENTER" contentDisplay="CENTER" prefHeight="40.0" prefWidth="40.0" text="\\\$index" textAlignment="CENTER" VBox.vgrow="NEVER">
                <font>
                   <Font size="9.0" />
                </font></Label>
          </children>
       </VBox>
-      <VBox prefWidth="1.0" />
-      <BorderPane>
+      <BorderPane maxWidth="263.5" HBox.hgrow="NEVER">
          <top>
             <HBox BorderPane.alignment="CENTER">
                <children>
-                  <ImageView fx:id="tickBox" fitHeight="15.0" fitWidth="15.0" pickOnBounds="true" preserveRatio="true">
+                  <ImageView fx:id="tickBox" fitHeight="15.0" fitWidth="15.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER">
                      <HBox.margin>
                         <Insets bottom="5.0" left="5.0" right="5.0" top="6.0" />
                      </HBox.margin></ImageView>
-                  <Label fx:id="title" text="\\\$title" underline="true">
+                  <Label fx:id="title" text="\$title" underline="true">
                      <HBox.margin>
                         <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-                     </HBox.margin></Label>
+                     </HBox.margin>
+                  </Label>
                </children>
                <BorderPane.margin>
                   <Insets left="5.0" />
@@ -42,20 +42,20 @@
          <center>
             <HBox BorderPane.alignment="CENTER">
                <children>
-                  <VBox id="box1">
+                  <VBox id="box1" HBox.hgrow="NEVER">
                      <children>
-                        <HBox>
+                        <HBox VBox.vgrow="ALWAYS">
                            <children>
-                              <ImageView fitHeight="13.0" fitWidth="13.0" pickOnBounds="true" preserveRatio="true">
+                              <ImageView fitHeight="13.0" fitWidth="13.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER">
                                  <HBox.margin>
                                     <Insets left="5.0" right="5.0" />
                                  </HBox.margin>
                                  <image>
                                     <Image url="@../images/summer.png" />
                                  </image></ImageView>
-                              <Label id="header" text="Time: " />
-                              <Label id="details" fx:id="time" text="\\\$time" />
-                              <FlowPane fx:id="tags" prefWrapLength="150.0">
+                              <Label id="header" minWidth="30.0" text="Time: " wrapText="true" HBox.hgrow="ALWAYS" />
+                              <Label id="details" fx:id="time" minWidth="50.0" text="\\\$time" wrapText="true" HBox.hgrow="ALWAYS" />
+                              <FlowPane fx:id="tags" prefWrapLength="150.0" HBox.hgrow="NEVER">
                                  <HBox.margin>
                                     <Insets left="15.0" />
                                  </HBox.margin>
@@ -77,12 +77,5 @@
             </HBox>
          </center>
       </BorderPane>
-<!--      <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">-->
-<!--         <image>-->
-<!--            <Image url="@../../../../docs/images/notes.png" />-->
-<!--         </image>-->
-<!--         <HBox.margin>-->
-<!--            <Insets left="10.0" />-->
-<!--         </HBox.margin></ImageView>-->
    </children>
 </HBox>
diff --git a/src/main/resources/view/ResultDisplay.fxml b/src/main/resources/view/ResultDisplay.fxml
@@ -9,7 +9,7 @@
 <StackPane fx:id="placeHolder" minHeight="165.0" styleClass="pane-with-border" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <VBox>
       <children>
-          <TextArea fx:id="resultDisplay" editable="false" styleClass="result-display" wrapText="true">
+          <TextArea fx:id="resultDisplay" editable="false" styleClass="result-display" wrapText="true" VBox.vgrow="ALWAYS">
             <padding>
                <Insets bottom="10.0" left="10.0" right="0.0" top="10.0" />
             </padding>

diff --git a/src/main/resources/view/UserDetailPane.fxml b/src/main/resources/view/UserDetailPane.fxml
@@ -6,7 +6,7 @@
 
 <VBox minHeight="200.0" minWidth="250.0" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <TableView fx:id="tableView" maxHeight="267.0" VBox.vgrow="ALWAYS">
+      <TableView fx:id="tableView" maxHeight="267.0" VBox.vgrow="NEVER">
         <columns>
           <TableColumn fx:id="field" maxWidth="150.0" minWidth="80.0" reorderable="false" sortable="false" text="Field" />
           <TableColumn fx:id="data" reorderable="false" sortable="false" text="Data" />

diff --git a/src/main/resources/view/UserOverallPane.fxml b/src/main/resources/view/UserOverallPane.fxml
@@ -7,7 +7,7 @@
 
 <VBox minWidth="340" styleClass="pane-with-border" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <HBox fx:id="userProfilePlaceholder" HBox.hgrow="ALWAYS">
+      <HBox fx:id="userProfilePlaceholder" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS">
          <padding>
             <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
          </padding>

diff --git a/src/main/resources/view/UserProfilePane.fxml b/src/main/resources/view/UserProfilePane.fxml
@@ -7,19 +7,19 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<HBox xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+<HBox minWidth="340.0" prefHeight="90.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <ImageView fx:id="profilePicture" fitHeight="90.0" fitWidth="90.0" pickOnBounds="true" preserveRatio="true" />
-      <ScrollPane fitToWidth="true" HBox.hgrow="ALWAYS">
+      <ImageView fx:id="profilePicture" fitHeight="90.0" fitWidth="90.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
+      <ScrollPane fitToWidth="true" maxWidth="240.0" minWidth="240.0" HBox.hgrow="NEVER">
          <content>
-            <VBox maxHeight="Infinity">
+            <VBox maxHeight="Infinity" maxWidth="240.0">
                <children>
-                  <Label fx:id="name" lineSpacing="5.0" maxHeight="Infinity" styleClass="name" text="Label" wrapText="true">
+                  <Label fx:id="name" lineSpacing="5.0" maxHeight="Infinity" styleClass="name" text="Label">
                      <VBox.margin>
                         <Insets bottom="5.0" left="10.0" right="10.0" top="5.0" />
                      </VBox.margin>
                   </Label>
-                  <Label fx:id="description" lineSpacing="5.0" maxHeight="Infinity" styleClass="description" text="Label" wrapText="true">
+                  <Label fx:id="description" lineSpacing="5.0" maxHeight="Infinity" styleClass="description" text="Label" wrapText="true" VBox.vgrow="ALWAYS">
                      <VBox.margin>
                         <Insets bottom="5.0" left="10.0" right="10.0" top="5.0" />
                      </VBox.margin></Label>