Merge pull request #5424 from jmacxx/cashbymail_enhance_terms2

Size popup proportional to amount of text shown
bisq-network · Apr 21, 2021 · 57adbdc · 57adbdc
2 parents e7446b0 + ca98975
commit 57adbdc
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/GenericMessageWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/GenericMessageWindow.java
@@ -59,6 +59,16 @@ private void addContent() {
         textArea.setEditable(false);
         textArea.setWrapText(true);
         // sizes the textArea to fit within its parent container
-        textArea.setPrefSize(Layout.INITIAL_WINDOW_WIDTH, Layout.INITIAL_WINDOW_HEIGHT * 0.9);
+        double verticalSizePercentage = ensureRange(countLines(message) / 20.0, 0.2, 0.7);
+        textArea.setPrefSize(Layout.INITIAL_WINDOW_WIDTH, Layout.INITIAL_WINDOW_HEIGHT * verticalSizePercentage);
+    }
+
+    private static int countLines(String str) {
+        String[] lines = str.split("\r\n|\r|\n");
+        return  lines.length;
+    }
+
+    private static double ensureRange(double value, double min, double max) {
+        return Math.min(Math.max(value, min), max);
     }
 }