Merged proposed paragraph style feature branch of MewesK and the current master branch #190
Conversation
Implemented the proposed paragraph style feature (#6)
…style update. Otherwise complete)
Implemented the proposed paragraph style feature (#6)
…style update. Otherwise complete)
# Conflicts: # richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/RichText.java # richtextfx/src/main/java/org/fxmisc/richtext/ClipboardActions.java # richtextfx/src/main/java/org/fxmisc/richtext/EditableStyledDocument.java # richtextfx/src/main/java/org/fxmisc/richtext/Paragraph.java # richtextfx/src/main/java/org/fxmisc/richtext/ReadOnlyStyledDocument.java # richtextfx/src/main/java/org/fxmisc/richtext/StyledDocumentBase.java # richtextfx/src/main/java/org/fxmisc/richtext/StyledTextArea.java # richtextfx/src/main/java/org/fxmisc/richtext/skin/ParagraphBox.java # richtextfx/src/main/java/org/fxmisc/richtext/skin/ParagraphText.java # richtextfx/src/main/java/org/fxmisc/richtext/skin/StyledTextAreaVisual.java # richtextfx/src/test/java/org/fxmisc/richtext/EditableStyledDocumentTest.java
|
Thanks for bringing it up to date with master! My comment from #168 remains, namely that |
|
Don't know if moving StyledTextAreaView in its own source file is what you wanted. But I made paragraphStyle immutable as you requested. |
| @@ -69,9 +70,10 @@ private CaretOffsetX(double value) { | |||
| public void setIndex(int index) { this.index.setValue(index); } | |||
| public int getIndex() { return index.getValue(); } | |||
|
|
|||
| public ParagraphBox(Paragraph<S> par, BiConsumer<? super TextExt, S> applyStyle) { | |||
| public ParagraphBox(Paragraph<S, PS> par, BiConsumer<? super TextExt, S> applyStyle, PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle) { | |||
There was a problem hiding this comment.
The argument initialParagraphStyle is not necessary.
|
Looks mostly OK. See my inline comments. Also, have you tried it with the demo RichText editor app? |
|
Made the suggested changes. I also tried the RichText demo app and it seems to work fine. |
|
Looks good. Merging. |
Merged proposed paragraph style feature branch
|
Turns out I was a bit too optimistic. The demo actually doesn't work for styling paragraphs (when |
|
Fixed in 8289b0f. |
Hi, I merged the current master branch into the feature branch with paragraph styles.