From 89868f3d0d42d1f240a50f856e0c646a099d056f Mon Sep 17 00:00:00 2001 From: "Robert C. Martin" Date: Thu, 16 Jun 2022 15:12:59 -0500 Subject: [PATCH] Word wrap the edit window using :wrap-lines in a 'styled-pane' --- spec/more_speech/ui/formatters_spec.clj | 1 + src/more_speech/ui/formatters.clj | 7 +------ src/more_speech/ui/swing/edit_window.clj | 7 +++++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/spec/more_speech/ui/formatters_spec.clj b/spec/more_speech/ui/formatters_spec.clj index 640cb21..75e4aa8 100644 --- a/spec/more_speech/ui/formatters_spec.clj +++ b/spec/more_speech/ui/formatters_spec.clj @@ -189,3 +189,4 @@ the proposition that all men are created equal." event {:content content :tags [[:p "deadbeef"]]}] (should= "#[1]" (replace-references event)))))) + diff --git a/src/more_speech/ui/formatters.clj b/src/more_speech/ui/formatters.clj index 81a1047..f3b3526 100644 --- a/src/more_speech/ui/formatters.clj +++ b/src/more_speech/ui/formatters.clj @@ -86,11 +86,7 @@ (let [tag (first tags)] (if (= (first tag) :subject) (abbreviate (second tag) 90) - (recur (rest tags)) - )) - - ) - ) + (recur (rest tags)))))) (declare lookup-reference) @@ -118,4 +114,3 @@ (str "id:" (abbreviate id-string 8)) name)] (str "@" name))))) - diff --git a/src/more_speech/ui/swing/edit_window.clj b/src/more_speech/ui/swing/edit_window.clj index 81d9621..f535c72 100644 --- a/src/more_speech/ui/swing/edit_window.clj +++ b/src/more_speech/ui/swing/edit_window.clj @@ -5,6 +5,8 @@ [more-speech.ui.swing.ui-context :refer :all]) (:use [seesaw core])) +(declare format-content) + (defn make-edit-window [kind] (let [reply? (= kind :reply) event-context (:event-context @ui-context) @@ -16,7 +18,8 @@ edit-frame (frame :title (name kind) :size [1000 :by 500] :on-close :dispose) - edit-area (editor-pane :font config/default-font) + edit-area (styled-text :font config/default-font + :wrap-lines? true) send-button (button :text "Send") event-map (:text-event-map event-state) selected-id (if reply? (:selected-event @event-context) nil) @@ -40,4 +43,4 @@ :north subject-panel :center (scrollable edit-area) :south (flow-panel :items [send-button]))) - (show! edit-frame))) \ No newline at end of file + (show! edit-frame)))