Merge pull request #1392 from ripcurlx/add-disabled-style

Add disabled style for offer
bisq-network · Feb 23, 2018 · 429b5c5 · 429b5c5
2 parents bdd9326 + 918995d
commit 429b5c5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/gui/src/main/java/io/bisq/gui/bisq.css b/gui/src/main/java/io/bisq/gui/bisq.css
@@ -593,6 +593,11 @@ textfield */
     -fx-background-color: -bs-content-bg-grey;
 }
 
+/* Open Offer */
+.offer-disabled {
+    -fx-text-fill: -bs-light-grey;
+}
+
 /* Account setup */
 #wizard-title-deactivated {
     -fx-font-weight: bold;

diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
@@ -227,10 +227,12 @@ public TableCell<OpenOfferListItem, OpenOfferListItem> call(
                             @Override
                             public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
-                                if (item != null)
+                                if (item != null) {
+                                    if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
                                     setText(model.getDate(item));
-                                else
+                                } else {
                                     setText("");
+                                }
                             }
                         };
                     }
@@ -249,6 +251,7 @@ public TableCell<OpenOfferListItem, OpenOfferListItem> call(
                             @Override
                             public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
+                                if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
                                 setText(model.getAmount(item));
                             }
                         };
@@ -268,6 +271,7 @@ public TableCell<OpenOfferListItem, OpenOfferListItem> call(
                             @Override
                             public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
+                                if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
                                 setText(model.getPrice(item));
                             }
                         };
@@ -287,10 +291,12 @@ public TableCell<OpenOfferListItem, OpenOfferListItem> call(
                             @Override
                             public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
-                                if (item != null)
+                                if (item != null) {
+                                    if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
                                     setText(model.getVolume(item));
-                                else
+                                } else {
                                     setText("");
+                                }
                             }
                         };
                     }
@@ -309,6 +315,7 @@ public TableCell<OpenOfferListItem, OpenOfferListItem> call(
                             @Override
                             public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
+                                if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
                                 setText(model.getDirectionLabel(item));
                             }
                         };
@@ -328,6 +335,7 @@ public TableCell<OpenOfferListItem, OpenOfferListItem> call(
                             @Override
                             public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
+                                if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
                                 setText(model.getMarketLabel(item));
                             }
                         };
@@ -376,6 +384,7 @@ public void updateItem(final OpenOfferListItem item, boolean empty) {
                                             onDeactivateOpenOffer(item.getOpenOffer());
                                         }
                                         updateState(item.getOpenOffer());
+                                        tableView.refresh();
                                     });
                                 } else {
                                     setGraphic(null);

diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java
@@ -107,6 +107,10 @@ String getDate(OpenOfferListItem item) {
         return formatter.formatDateTime(item.getOffer().getDate());
     }
 
+    boolean isDeactivated(OpenOfferListItem item){
+        return item != null && item.getOpenOffer() != null && item.getOpenOffer().isDeactivated();
+    }
+
     boolean isBootstrapped() {
         return p2PService.isBootstrapped();
     }