Fix button focus color

AY2122S1-CS2103-F09-2 · Oct 31, 2021 · afd4b5e · afd4b5e
1 parent 8ce1403
commit afd4b5e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/src/main/java/seedu/address/ui/EditTaskDialog.java b/src/main/java/seedu/address/ui/EditTaskDialog.java
@@ -216,6 +216,16 @@ private void initializeFields(Task t) {
             }
         });
 
+        tagInput.focusedProperty().addListener((observable) -> {
+            if (!contactInput.isFocused())
+                dialog.getDialogPane().getScene().getWindow().sizeToScene();
+        });
+
+        contactInput.focusedProperty().addListener((observable) -> {
+            if (!tagInput.isFocused())
+                dialog.getDialogPane().getScene().getWindow().sizeToScene();
+        });
+
         // When tag list changes, update tag chip list
         tags.addListener((Observable observable) -> {
             tagPane.getChildren().clear();

diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
@@ -6,7 +6,7 @@
     -fx-color-bg-raised: derive(-fx-color-bg, 8%);
     -fx-color-raised: derive(-fx-color-bg-raised, 15%);
     -fx-color-hovered: derive(-fx-color-bg-raised, 20%);
-    -fx-color-focused: derive(-fx-color-bg-raised, 16%);
+    -fx-color-focused: derive(-fx-color-bg-raised, 40%);
     -fx-color-pressed: derive(-fx-color-bg-raised, 16%);
     -fx-color-selected: derive(-fx-color-bg-raised, 10%);
     -fx-text-fill: #EEEEEE;

diff --git a/src/main/resources/view/EditTaskDialog.fxml b/src/main/resources/view/EditTaskDialog.fxml
@@ -64,7 +64,7 @@
                </VBox.margin></FlowPane>
          </children>
          <VBox.margin>
-            <Insets bottom="8.0" />
+            <Insets bottom="16.0" />
          </VBox.margin>
       </VBox>
       <VBox layoutX="26.0" layoutY="252.0">
@@ -81,8 +81,14 @@
                   <Insets top="8.0" />
                </VBox.margin></FlowPane>
          </children>
+         <VBox.margin>
+            <Insets bottom="16.0" />
+         </VBox.margin>
       </VBox>
-      <CheckBox fx:id="isDone" mnemonicParsing="false" text="Mark task as done" />
+      <CheckBox fx:id="isDone" mnemonicParsing="false" text="Mark task as done">
+         <VBox.margin>
+            <Insets />
+         </VBox.margin></CheckBox>
    </children>
    <padding>
       <Insets bottom="16.0" left="16.0" right="16.0" top="16.0" />

diff --git a/src/main/resources/view/Extensions.css b/src/main/resources/view/Extensions.css
@@ -54,11 +54,15 @@
     -fx-text-fill: white;
     -fx-font-weight: bold;
     -fx-border-width: 0;
+    -fx-background-radius: 100;
 }
 
 .filter-chip .button:hover {
     -fx-background-color: -fx-color-hovered;
-    -fx-background-radius: 100;
+}
+
+.filter-chip .button:focused {
+    -fx-background-color: -fx-color-focused;
 }
 
 .filter-combo-box.combo-box-base .list-cell {