Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-07 06:02:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix height of extra info popup on take offer

Browse source
This commit is contained in:
woodser 2025-05-17 10:17:30 -04:00
parent 52c1c70a31
commit abc5f7812c
No known key found for this signature in database
GPG key ID: 55A10DD48ADEE5EF
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
desktop/src/main/java/haveno/desktop/main/overlays/windows/GenericMessageWindow.java
View file

@ -18,6 +18,7 @@
package haveno.desktop.main.overlays.windows; package haveno.desktop.main.overlays.windows;
import haveno.desktop.main.overlays.Overlay; import haveno.desktop.main.overlays.Overlay;
import haveno.desktop.util.GUIUtil;
import haveno.desktop.util.Layout; import haveno.desktop.util.Layout;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.TextArea; import javafx.scene.control.TextArea;
@ -28,6 +29,7 @@ import static haveno.desktop.util.FormBuilder.addTextArea;
public class GenericMessageWindow extends Overlay<GenericMessageWindow> { public class GenericMessageWindow extends Overlay<GenericMessageWindow> {
private String preamble; private String preamble;
private static final double MAX_TEXT_AREA_HEIGHT = 250;
public GenericMessageWindow() { public GenericMessageWindow() {
super(); super();
@ -57,17 +59,7 @@ public class GenericMessageWindow extends Overlay<GenericMessageWindow> {
textArea.setText(message); textArea.setText(message);
textArea.setEditable(false); textArea.setEditable(false);
textArea.setWrapText(true); textArea.setWrapText(true);
// sizes the textArea to fit within its parent container textArea.setPrefWidth(Layout.INITIAL_WINDOW_WIDTH);
double verticalSizePercentage = ensureRange(countLines(message) / 20.0, 0.2, 0.7); GUIUtil.adjustHeightAutomatically(textArea, MAX_TEXT_AREA_HEIGHT);
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);
} }
} }

7
desktop/src/main/java/haveno/desktop/util/GUIUtil.java
View file

@ -1181,6 +1181,10 @@ public class GUIUtil {
} }
public static void adjustHeightAutomatically(TextArea textArea) { public static void adjustHeightAutomatically(TextArea textArea) {
adjustHeightAutomatically(textArea, null);
}
public static void adjustHeightAutomatically(TextArea textArea, Double maxHeight) {
textArea.sceneProperty().addListener((o, oldScene, newScene) -> { textArea.sceneProperty().addListener((o, oldScene, newScene) -> {
if (newScene != null) { if (newScene != null) {
// avoid javafx css warning // avoid javafx css warning
@ -1192,7 +1196,8 @@ public class GUIUtil {
textArea.prefHeightProperty().bind(Bindings.createDoubleBinding(() -> { textArea.prefHeightProperty().bind(Bindings.createDoubleBinding(() -> {
Insets padding = textArea.getInsets(); Insets padding = textArea.getInsets();
double topBottomPadding = padding.getTop() + padding.getBottom(); double topBottomPadding = padding.getTop() + padding.getBottom();
return textArea.getFont().getSize() + text.getBoundsInLocal().getHeight() + topBottomPadding; double prefHeight = textArea.getFont().getSize() + text.getBoundsInLocal().getHeight() + topBottomPadding;
return maxHeight == null ? prefHeight : Math.min(prefHeight, maxHeight);
}, text.boundsInLocalProperty())); }, text.boundsInLocalProperty()));
text.boundsInLocalProperty().addListener((observableBoundsAfter, boundsBefore, boundsAfter) -> { text.boundsInLocalProperty().addListener((observableBoundsAfter, boundsBefore, boundsAfter) -> {