From 56087fec1c75cae5bd8a14fdb2bf9a011eeb9629 Mon Sep 17 00:00:00 2001 From: crschnick Date: Tue, 21 May 2024 15:15:01 +0000 Subject: [PATCH] Markdown fixes --- .../main/java/io/xpipe/app/comp/base/MarkdownEditorComp.java | 2 ++ app/src/main/java/io/xpipe/app/comp/store/StoreNotesComp.java | 4 +--- .../main/java/io/xpipe/app/update/UpdateAvailableAlert.java | 2 +- .../main/java/io/xpipe/app/update/UpdateChangelogAlert.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/comp/base/MarkdownEditorComp.java b/app/src/main/java/io/xpipe/app/comp/base/MarkdownEditorComp.java index 1b0fbee6..2a0c4bb0 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/MarkdownEditorComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/MarkdownEditorComp.java @@ -50,6 +50,8 @@ public class MarkdownEditorComp extends Comp { pane.setPickOnBounds(false); AnchorPane.setTopAnchor(editButton, 10.0); AnchorPane.setRightAnchor(editButton, 10.0); + markdown.prefWidthProperty().bind(pane.prefWidthProperty()); + markdown.prefHeightProperty().bind(pane.prefHeightProperty()); return new Structure(pane, markdown, editButton); } diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreNotesComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreNotesComp.java index a7c868c7..fe7949b2 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreNotesComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreNotesComp.java @@ -73,7 +73,7 @@ public class StoreNotesComp extends Comp { private Popover createPopover(AtomicReference ref, Property prop) { var n = wrapper.getNotes(); - var md = new MarkdownEditorComp(prop, "notes-" + wrapper.getName().getValue()).createStructure(); + var md = new MarkdownEditorComp(prop, "notes-" + wrapper.getName().getValue()).prefWidth(600).prefHeight(600).createStructure(); var dialog = new DialogComp() { @Override @@ -112,8 +112,6 @@ public class StoreNotesComp extends Comp { popover.setHeaderAlwaysVisible(true); popover.setDetachable(true); popover.setTitle(wrapper.getName().getValue()); - popover.setMaxWidth(400); - popover.setHeight(600); popover.showingProperty().addListener((observable, oldValue, newValue) -> { if (!newValue) { n.setValue(new StoreNotes(n.getValue().getCommited(), n.getValue().getCommited())); diff --git a/app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java b/app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java index 6abad8ed..e9534a66 100644 --- a/app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java +++ b/app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java @@ -31,7 +31,7 @@ public class UpdateAvailableAlert { alert.setTitle(AppI18n.get("updateReadyAlertTitle")); alert.setAlertType(Alert.AlertType.NONE); var markdown = - new MarkdownComp(u.getBody() != null ? u.getBody() : "", s -> " " + s).createRegion(); + new MarkdownComp(u.getBody() != null ? u.getBody() : "", s -> s).createRegion(); alert.getButtonTypes().clear(); var updaterContent = uh.createInterface(); if (updaterContent != null) { diff --git a/app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java b/app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java index 6fc95ef5..5b524d49 100644 --- a/app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java +++ b/app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java @@ -46,7 +46,7 @@ public class UpdateChangelogAlert { alert.setAlertType(Alert.AlertType.NONE); alert.initModality(Modality.NONE); - var markdown = new MarkdownComp(update.getRawDescription(), s -> " " + s).createRegion(); + var markdown = new MarkdownComp(update.getRawDescription(), s -> s).createRegion(); alert.getDialogPane().setContent(markdown); alert.getButtonTypes().add(new ButtonType(AppI18n.get("ok"), ButtonBar.ButtonData.OK_DONE));