From 323edc7230d2fee6ad2e07f9ed6bc77f69dd2cf9 Mon Sep 17 00:00:00 2001 From: Jurgen Date: Fri, 22 Nov 2019 09:29:25 +0200 Subject: [PATCH] Switched priority of insertionStyle and initialStyle (#871) --- .../java/org/fxmisc/richtext/GenericStyledArea.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/GenericStyledArea.java b/richtextfx/src/main/java/org/fxmisc/richtext/GenericStyledArea.java index 0210b9a8b..8a3b48c0f 100644 --- a/richtextfx/src/main/java/org/fxmisc/richtext/GenericStyledArea.java +++ b/richtextfx/src/main/java/org/fxmisc/richtext/GenericStyledArea.java @@ -1288,10 +1288,10 @@ public void setParagraphStyle(int paragraph, PS paragraphStyle) { @Override public final S getTextStyleForInsertionAt(int pos) { - if(useInitialStyleForInsertion.get()) { - return initialTextStyle; - } else if ( insertionTextStyle != null ) { + if ( insertionTextStyle != null ) { return insertionTextStyle; + } else if ( useInitialStyleForInsertion.get() ) { + return initialTextStyle; } else { return content.getStyleAtPosition(pos); } @@ -1306,10 +1306,10 @@ public final S getTextStyleForInsertionAt(int pos) { @Override public final PS getParagraphStyleForInsertionAt(int pos) { - if(useInitialStyleForInsertion.get()) { - return initialParagraphStyle; - } else if ( insertionParagraphStyle != null ) { + if ( insertionParagraphStyle != null ) { return insertionParagraphStyle; + } else if ( useInitialStyleForInsertion.get() ) { + return initialParagraphStyle; } else { return content.getParagraphStyleAtPosition(pos); }