Skip to content

Merged proposed paragraph style feature branch of MewesK and the current master branch #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasMikula merged 11 commits into from
Oct 16, 2015
Merged

Merged proposed paragraph style feature branch of MewesK and the current master branch #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8e13838
Added background color to the RichText demo
MewesK Aug 20, 2015
af117dc
Proposed paragraph style setting (Paragraph style vanishs after text/…
MewesK Aug 21, 2015
bd96001
Bug fixed
MewesK Aug 21, 2015
cb3b5f9
Added background color to the RichText demo
MewesK Aug 20, 2015
0ae84c2
Proposed paragraph style setting (Paragraph style vanishs after text/…
MewesK Aug 21, 2015
20a7a2d
Bug fixed
MewesK Aug 21, 2015
32986a5
Merged ThomasMikula:master branch.
Oct 14, 2015
5a64fb0
Merge remote-tracking branch 'origin/master'
Oct 14, 2015
6ee0a43
Moved StyledTextAreaView into its own source file.
Oct 15, 2015
ba4794e
Made paragraphStyle immutable.
Oct 15, 2015
9898fe0
Removed unnecessary initial paragraph style.
Oct 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 77 additions & 31 deletions richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/RichText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import javafx.application.Application;
import javafx.beans.binding.Bindings;
import javafx.beans.binding.BooleanBinding;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.collections.FXCollections;
import javafx.scene.Scene;
import javafx.scene.control.Button;
Expand All @@ -33,6 +35,8 @@

import org.fxmisc.richtext.Codec;
import org.fxmisc.richtext.InlineStyleTextArea;
import org.fxmisc.richtext.Paragraph;
import org.fxmisc.richtext.StyleSpan;
import org.fxmisc.richtext.StyleSpans;
import org.reactfx.SuspendableNo;

Expand Down Expand Up @@ -180,14 +184,16 @@ private static String cssColor(Color color) {
final Optional<Color> backgroundColor;

public StyleInfo() {
bold = Optional.empty();
italic = Optional.empty();
underline = Optional.empty();
strikethrough = Optional.empty();
fontSize = Optional.empty();
fontFamily = Optional.empty();
textColor = Optional.empty();
backgroundColor = Optional.empty();
this(
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty()
);
}

public StyleInfo(
Expand Down Expand Up @@ -338,31 +344,34 @@ public static void main(String[] args) {
launch(args);
}

private final InlineStyleTextArea<StyleInfo> area =
new InlineStyleTextArea<StyleInfo>(
private final InlineStyleTextArea<StyleInfo, StyleInfo> area =
new InlineStyleTextArea<>(
StyleInfo.EMPTY.updateFontSize(12).updateFontFamily("Serif").updateTextColor(Color.BLACK),
style -> style.toCss());
StyleInfo::toCss,
StyleInfo.EMPTY,
StyleInfo::toCss);
{
area.setWrapText(true);
area.setStyleCodec(StyleInfo.CODEC);
}

private final SuspendableNo updatingToolbar = new SuspendableNo();
private final BooleanProperty applyToParagraph = new SimpleBooleanProperty(false);

@Override
public void start(Stage primaryStage) {
CheckBox wrapToggle = new CheckBox("Wrap");
wrapToggle.setSelected(true);
area.wrapTextProperty().bind(wrapToggle.selectedProperty());
Button undoBtn = createButton("undo", () -> area.undo());
Button redoBtn = createButton("redo", () -> area.redo());
Button cutBtn = createButton("cut", () -> area.cut());
Button copyBtn = createButton("copy", () -> area.copy());
Button pasteBtn = createButton("paste", () -> area.paste());
Button boldBtn = createButton("bold", () -> toggleBold());
Button italicBtn = createButton("italic", () -> toggleItalic());
Button underlineBtn = createButton("underline", () -> toggleUnderline());
Button strikeBtn = createButton("strikethrough", () -> toggleStrikethrough());
Button undoBtn = createButton("undo", area::undo);
Button redoBtn = createButton("redo", area::redo);
Button cutBtn = createButton("cut", area::cut);
Button copyBtn = createButton("copy", area::copy);
Button pasteBtn = createButton("paste", area::paste);
Button boldBtn = createButton("bold", this::toggleBold);
Button italicBtn = createButton("italic", this::toggleItalic);
Button underlineBtn = createButton("underline", this::toggleUnderline);
Button strikeBtn = createButton("strikethrough", this::toggleStrikethrough);
ComboBox<Integer> sizeCombo = new ComboBox<>(FXCollections.observableArrayList(5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 18, 20, 22, 24, 28, 32, 36, 40, 48, 56, 64, 72));
sizeCombo.getSelectionModel().select(Integer.valueOf(12));
ComboBox<String> familyCombo = new ComboBox<>(FXCollections.observableList(Font.getFamilies()));
Expand Down Expand Up @@ -407,9 +416,9 @@ protected boolean computeValue() {
strike = styles.styleStream().anyMatch(s -> s.strikethrough.orElse(false));
int[] sizes = styles.styleStream().mapToInt(s -> s.fontSize.orElse(-1)).distinct().toArray();
fontSize = sizes.length == 1 ? sizes[0] : -1;
String[] families = styles.styleStream().map(s -> s.fontFamily.orElse(null)).distinct().toArray(i -> new String[i]);
String[] families = styles.styleStream().map(s -> s.fontFamily.orElse(null)).distinct().toArray(String[]::new);
fontFamily = families.length == 1 ? families[0] : null;
Color[] colors = styles.styleStream().map(s -> s.textColor.orElse(null)).distinct().toArray(i -> new Color[i]);
Color[] colors = styles.styleStream().map(s -> s.textColor.orElse(null)).distinct().toArray(Color[]::new);
textColor = colors.length == 1 ? colors[0] : null;
Color[] backgrounds = styles.styleStream().map(s -> s.backgroundColor.orElse(null)).distinct().toArray(i -> new Color[i]);
backgroundColor = backgrounds.length == 1 ? backgrounds[0] : null;
Expand Down Expand Up @@ -511,19 +520,35 @@ private Button createButton(String styleClass, Runnable action) {
}

private void toggleBold() {
updateStyleInSelection(spans -> StyleInfo.EMPTY.updateBold(!spans.styleStream().allMatch(style -> style.bold.orElse(false))));
if (!applyToParagraph.get()) {
updateStyleInSelection(spans -> StyleInfo.EMPTY.updateBold(!spans.styleStream().allMatch(style -> style.bold.orElse(false))));
} else {
updateParagraphStyleInSelection(styleInfo -> styleInfo.updateBold(!styleInfo.bold.orElse(false)));
}
}

private void toggleItalic() {
updateStyleInSelection(spans -> StyleInfo.EMPTY.updateItalic(!spans.styleStream().allMatch(style -> style.italic.orElse(false))));
if (!applyToParagraph.get()) {
updateStyleInSelection(spans -> StyleInfo.EMPTY.updateItalic(!spans.styleStream().allMatch(style -> style.italic.orElse(false))));
} else {
updateParagraphStyleInSelection(styleInfo -> styleInfo.updateItalic(!styleInfo.italic.orElse(false)));
}
}

private void toggleUnderline() {
updateStyleInSelection(spans -> StyleInfo.EMPTY.updateUnderline(!spans.styleStream().allMatch(style -> style.underline.orElse(false))));
if (!applyToParagraph.get()) {
updateStyleInSelection(spans -> StyleInfo.EMPTY.updateUnderline(!spans.styleStream().allMatch(style -> style.underline.orElse(false))));
} else {
updateParagraphStyleInSelection(styleInfo -> styleInfo.updateUnderline(!styleInfo.underline.orElse(false)));
}
}

private void toggleStrikethrough() {
updateStyleInSelection(spans -> StyleInfo.EMPTY.updateStrikethrough(!spans.styleStream().allMatch(style -> style.strikethrough.orElse(false))));
if (!applyToParagraph.get()) {
updateStyleInSelection(spans -> StyleInfo.EMPTY.updateStrikethrough(!spans.styleStream().allMatch(style -> style.strikethrough.orElse(false))));
} else {
updateParagraphStyleInSelection(styleInfo -> styleInfo.updateStrikethrough(!styleInfo.strikethrough.orElse(false)));
}
}

private void updateStyleInSelection(Function<StyleSpans<StyleInfo>, StyleInfo> mixinGetter) {
Expand All @@ -538,34 +563,55 @@ private void updateStyleInSelection(Function<StyleSpans<StyleInfo>, StyleInfo> m

private void updateStyleInSelection(StyleInfo mixin) {
IndexRange selection = area.getSelection();
if(selection.getLength() != 0) {
if (selection.getLength() != 0) {
StyleSpans<StyleInfo> styles = area.getStyleSpans(selection);
StyleSpans<StyleInfo> newStyles = styles.mapStyles(style -> style.updateWith(mixin));
area.setStyleSpans(selection.getStart(), newStyles);
}
}

private void updateParagraphStyleInSelection(Function<StyleInfo, StyleInfo> updater) {
Paragraph<StyleInfo, StyleInfo> paragraph = area.getParagraph(area.getCurrentParagraph());
paragraph.setParagraphStyle(updater.apply(paragraph.getParagraphStyle()));
}

private void updateFontSize(Integer size) {
if(!updatingToolbar.get()) {
updateStyleInSelection(StyleInfo.fontSize(size));
if (!applyToParagraph.get()) {
updateStyleInSelection(StyleInfo.fontSize(size));
} else {
updateParagraphStyleInSelection(styleInfo -> styleInfo.updateFontSize(size));
}
}
}

private void updateFontFamily(String family) {
if(!updatingToolbar.get()) {
updateStyleInSelection(StyleInfo.fontFamily(family));
if (!applyToParagraph.get()) {
updateStyleInSelection(StyleInfo.fontFamily(family));
} else {
updateParagraphStyleInSelection(styleInfo -> styleInfo.updateFontFamily(family));
}
}
}

private void updateTextColor(Color color) {
if(!updatingToolbar.get()) {
updateStyleInSelection(StyleInfo.textColor(color));
if (!applyToParagraph.get()) {
updateStyleInSelection(StyleInfo.textColor(color));
} else {
updateParagraphStyleInSelection(styleInfo -> styleInfo.updateTextColor(color));
}
}
}

private void updateBackgroundColor(Color color) {
if(!updatingToolbar.get()) {
updateStyleInSelection(StyleInfo.backgroundColor(color));
if (!applyToParagraph.get()) {
updateStyleInSelection(StyleInfo.backgroundColor(color));
} else {
updateParagraphStyleInSelection(styleInfo -> styleInfo.updateBackgroundColor(color));
}
}
}
}
10 changes: 5 additions & 5 deletions richtextfx/src/main/java/org/fxmisc/richtext/ClipboardActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/**
* Clipboard actions for {@link TextEditingArea}.
*/
public interface ClipboardActions<S> extends EditActions<S> {
public interface ClipboardActions<S, PS> extends EditActions<S, PS> {

Optional<Codec<S>> getStyleCodec();

Expand All @@ -43,9 +43,9 @@ default void copy() {
content.putString(getSelectedText());

getStyleCodec().ifPresent(styleCodec -> {
Codec<StyledDocument<S>> codec = ReadOnlyStyledDocument.codec(styleCodec);
Codec<StyledDocument<S, PS>> codec = ReadOnlyStyledDocument.codec(styleCodec);
DataFormat format = dataFormat(codec.getName());
StyledDocument<S> doc = subDocument(selection.getStart(), selection.getEnd());
StyledDocument<S, PS> doc = subDocument(selection.getStart(), selection.getEnd());
ByteArrayOutputStream os = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(os);
try {
Expand All @@ -71,13 +71,13 @@ default void paste() {

if(getStyleCodec().isPresent()) {
Codec<S> styleCodec = getStyleCodec().get();
Codec<StyledDocument<S>> codec = ReadOnlyStyledDocument.codec(styleCodec);
Codec<StyledDocument<S, PS>> codec = ReadOnlyStyledDocument.codec(styleCodec);
DataFormat format = dataFormat(codec.getName());
if(clipboard.hasContent(format)) {
byte[] bytes = (byte[]) clipboard.getContent(format);
ByteArrayInputStream is = new ByteArrayInputStream(bytes);
DataInputStream dis = new DataInputStream(is);
StyledDocument<S> doc = null;
StyledDocument<S, PS> doc = null;
try {
doc = codec.decode(dis);
} catch (IOException e) {
Expand Down
12 changes: 6 additions & 6 deletions richtextfx/src/main/java/org/fxmisc/richtext/EditActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
* Extended edit actions for {@link TextEditingArea}.
*/
public interface EditActions<S> extends TextEditingArea<S> {
public interface EditActions<S, PS> extends TextEditingArea<S, PS> {

/**
* Appends the given text to the end of the text content.
Expand All @@ -17,7 +17,7 @@ default void appendText(String text) {
/**
* Appends the given rich-text content to the end of this text-editing area.
*/
default void append(StyledDocument<S> document) {
default void append(StyledDocument<S, PS> document) {
insert(getLength(), document);
}

Expand All @@ -37,7 +37,7 @@ default void insertText(int index, String text) {
* @param index The location to insert the text.
* @param document The rich-text content to insert.
*/
default void insert(int index, StyledDocument<S> document) {
default void insert(int index, StyledDocument<S, PS> document) {
replace(index, index, document);
}

Expand Down Expand Up @@ -105,7 +105,7 @@ default void replaceText(String replacement) {
/**
* Replaces the entire content with the given rich-text content.
*/
default void replace(StyledDocument<S> replacement) {
default void replace(StyledDocument<S, PS> replacement) {
replace(0, getLength(), replacement);
}

Expand All @@ -125,7 +125,7 @@ default void replaceSelection(String replacement) {
* caret position. If there was a selection, then the selection is cleared
* and the given replacement text is inserted.
*/
default void replaceSelection(StyledDocument<S> replacement) {
default void replaceSelection(StyledDocument<S, PS> replacement) {
replace(getSelection(), replacement);
}

Expand All @@ -136,7 +136,7 @@ default void moveSelectedText(int pos) {
// no move, just position the caret
selectRange(pos, pos);
} else {
StyledDocument<S> text = this.subDocument(sel.getStart(), sel.getEnd());
StyledDocument<S, PS> text = this.subDocument(sel.getStart(), sel.getEnd());
if(pos > sel.getEnd())
pos -= sel.getLength();
deleteText(sel);
Expand Down
Loading
⚡