the-btfash-foundation/Markwon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for heading break height and thematic break height

Browse Source
This commit is contained in:
Dimitry Ivanov 2017-11-22 13:12:53 +03:00
parent c0c77802db
commit 59f647e5cc
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/src/main/java/ru/noties/markwon/spans/HeadingSpan.java
View File

@ -53,6 +53,9 @@ public class HeadingSpan extends MetricAffectingSpan implements LeadingMarginSpa
theme.applyHeadingBreakStyle(paint); theme.applyHeadingBreakStyle(paint);
final float height = paint.getStrokeWidth(); final float height = paint.getStrokeWidth();
if (height > .0F) {
final int b = (int) (bottom - height + .5F); final int b = (int) (bottom - height + .5F);
final int left; final int left;
@ -69,4 +72,5 @@ public class HeadingSpan extends MetricAffectingSpan implements LeadingMarginSpa
c.drawRect(rect, paint); c.drawRect(rect, paint);
} }
} }
}
} }

8
library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java
View File

@ -336,7 +336,7 @@ public class SpannableTheme {
} }
paint.setColor(color); paint.setColor(color);
paint.setStyle(Paint.Style.FILL); paint.setStyle(Paint.Style.FILL);
if (headingBreakHeight != 0) { if (headingBreakHeight >= 0) {
//noinspection SuspiciousNameCombination //noinspection SuspiciousNameCombination
paint.setStrokeWidth(headingBreakHeight); paint.setStrokeWidth(headingBreakHeight);
} }
@ -374,7 +374,7 @@ public class SpannableTheme {
paint.setColor(color); paint.setColor(color);
paint.setStyle(Paint.Style.FILL); paint.setStyle(Paint.Style.FILL);
if (thematicBreakHeight != 0) { if (thematicBreakHeight >= 0) {
//noinspection SuspiciousNameCombination //noinspection SuspiciousNameCombination
paint.setStrokeWidth(thematicBreakHeight); paint.setStrokeWidth(thematicBreakHeight);
} }
@ -435,11 +435,11 @@ public class SpannableTheme {
private int codeMultilineMargin; private int codeMultilineMargin;
private Typeface codeTypeface; private Typeface codeTypeface;
private int codeTextSize; private int codeTextSize;
private int headingBreakHeight; private int headingBreakHeight = -1;
private int headingBreakColor; private int headingBreakColor;
private float scriptTextSizeRatio; private float scriptTextSizeRatio;
private int thematicBreakColor; private int thematicBreakColor;
private int thematicBreakHeight; private int thematicBreakHeight = -1;
private int tableCellPadding; private int tableCellPadding;
private int tableBorderColor; private int tableBorderColor;
private int tableBorderWidth; private int tableBorderWidth;