Switched priority of insertionStyle and initialStyle (#871)

FXMisc · Nov 22, 2019 · 323edc7 · 323edc7
1 parent b8f563d
commit 323edc7
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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);
         }