From 261a03702012d204e7ea64163eb2f651b466255a Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Fri, 15 Apr 2016 02:31:20 +0200
Subject: [PATCH] Hide perc box if not perc based price used, fix toggle button

---
 core/src/main/java/io/bitsquare/trade/offer/Offer.java     | 2 +-
 .../gui/main/offer/createoffer/CreateOfferView.java        | 2 ++
 .../gui/main/offer/offerbook/OfferBookViewModel.java       | 2 +-
 .../bitsquare/gui/main/offer/takeoffer/TakeOfferView.java  | 7 +++++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/trade/offer/Offer.java b/core/src/main/java/io/bitsquare/trade/offer/Offer.java
index e99b8cb2b7..6c29fb63b2 100644
--- a/core/src/main/java/io/bitsquare/trade/offer/Offer.java
+++ b/core/src/main/java/io/bitsquare/trade/offer/Offer.java
@@ -364,7 +364,7 @@ public final class Offer implements StoragePayload, RequiresOwnerIsOnlinePayload
         return marketPriceMargin;
     }
 
-    public boolean isUsePercentageBasedPrice() {
+    public boolean getUsePercentageBasedPrice() {
         return usePercentageBasedPrice;
     }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
index 66dcce3b95..20706721bf 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
@@ -938,6 +938,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
         fixedPriceButton.setToggleGroup(toggleGroup);
         fixedPriceButton.selectedProperty().addListener((ov, oldValue, newValue) -> {
             model.dataModel.setUsePercentageBasedPrice(!newValue);
+            percentagePriceButton.setSelected(!newValue);
         });
 
         percentagePriceButton = new ToggleButton("Percentage");
@@ -945,6 +946,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
         percentagePriceButton.setToggleGroup(toggleGroup);
         percentagePriceButton.selectedProperty().addListener((ov, oldValue, newValue) -> {
             model.dataModel.setUsePercentageBasedPrice(newValue);
+            fixedPriceButton.setSelected(!newValue);
         });
 
         HBox toggleButtons = new HBox();
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java
index b908e49af5..d64215bb42 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java
@@ -263,7 +263,7 @@ class OfferBookViewModel extends ActivatableViewModel {
         Offer offer = item.getOffer();
         Fiat price = offer.getPrice();
         String postFix = "";
-        if (offer.isUsePercentageBasedPrice()) {
+        if (offer.getUsePercentageBasedPrice()) {
             postFix = " (" + formatter.formatToPercentWithSymbol(offer.getMarketPriceMargin()) + ")";
         }
         if (showAllTradeCurrenciesProperty.get())
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
index b644c84dbc..f149b9d0f6 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
@@ -116,6 +116,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
     // private Subscription noSufficientFeeSubscription;
     //  private MonadicBinding<Boolean> noSufficientFeeBinding;
     private Subscription cancelButton2StyleSubscription;
+    private VBox priceAsPercentageInputBox;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -195,6 +196,8 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
     public void initWithData(Offer offer) {
         model.initWithData(offer);
 
+        priceAsPercentageInputBox.setVisible(offer.getUsePercentageBasedPrice());
+
         if (model.getOffer().getDirection() == Offer.Direction.SELL) {
             imageView.setId("image-buy-large");
             directionLabel.setId("direction-icon-label-buy");
@@ -211,7 +214,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
             takeOfferButton.setText("Review offer for selling bitcoin");
         }
 
-
         boolean showComboBox = model.getPossiblePaymentAccounts().size() > 1;
         paymentAccountsLabel.setVisible(showComboBox);
         paymentAccountsLabel.setManaged(showComboBox);
@@ -850,7 +852,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
 
         Tuple2<Label, VBox> priceAsPercentageInputBoxTuple = getTradeInputBox(priceAsPercentageValueCurrencyBox, "Distance in % from market price");
         priceAsPercentageInputBoxTuple.first.setPrefWidth(200);
-        VBox priceAsPercentageInputBox = priceAsPercentageInputBoxTuple.second;
+        priceAsPercentageInputBox = priceAsPercentageInputBoxTuple.second;
 
         priceAsPercentageTextField.setPromptText("Enter % value");
         priceAsPercentageLabel.setText("% dist.");
@@ -873,6 +875,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
         hBox.setSpacing(5);
         hBox.setAlignment(Pos.CENTER_LEFT);
         hBox.getChildren().addAll(amountInputBoxTuple.second, xLabel, priceAsPercentageInputBox);
+
         GridPane.setRowIndex(hBox, ++gridRow);
         GridPane.setColumnIndex(hBox, 1);
         GridPane.setMargin(hBox, new Insets(5, 10, 5, 0));