Merge pull request #4031 from jmacxx/fix_resize_issue_4030

Size the offer book on window activation
bisq-network · Mar 18, 2020 · 89cfb34 · 89cfb34
2 parents d9b5422 + 02d37b7
commit 89cfb34
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java b/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java
@@ -42,6 +42,7 @@
 
 import bisq.network.p2p.NodeAddress;
 
+import bisq.common.UserThread;
 import bisq.common.config.Config;
 import bisq.common.util.Tuple3;
 import bisq.common.util.Tuple4;
@@ -91,6 +92,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 import static bisq.desktop.util.FormBuilder.addTopLabelAutocompleteComboBox;
@@ -280,6 +282,7 @@ public Number fromString(String string) {
         sellOfferTableView.getSelectionModel().selectedItemProperty().addListener(sellTableRowSelectionListener);
 
         root.getScene().heightProperty().addListener(bisqWindowVerticalSizeListener);
+        layout();
 
         updateChartData();
     }
@@ -321,13 +324,7 @@ private void createListener() {
             navigation.navigateTo(MainView.class, BuyOfferView.class);
         };
 
-        bisqWindowVerticalSizeListener = (observable, oldValue, newValue) -> {
-            double newTableViewHeight = offerTableViewHeight.apply(newValue.doubleValue());
-            if (buyOfferTableView.getHeight() != newTableViewHeight) {
-                buyOfferTableView.setMinHeight(newTableViewHeight);
-                sellOfferTableView.setMinHeight(newTableViewHeight);
-            }
-        };
+        bisqWindowVerticalSizeListener = (observable, oldValue, newValue) -> layout();
     }
 
     @Override
@@ -665,4 +662,16 @@ private void reverseTableColumns() {
         Collections.reverse(columns);
         sellOfferTableView.getColumns().addAll(columns);
     }
+
+    private void layout() {
+        UserThread.runAfter(() -> {
+            if (root.getScene() != null) {
+                double newTableViewHeight = offerTableViewHeight.apply(root.getScene().getHeight());
+                if (buyOfferTableView.getHeight() != newTableViewHeight) {
+                    buyOfferTableView.setMinHeight(newTableViewHeight);
+                    sellOfferTableView.setMinHeight(newTableViewHeight);
+               }
+            }
+       }, 100, TimeUnit.MILLISECONDS);
+   }
 }