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

Tables can have no borders (0)

Browse Source
This commit is contained in:
Dimitry Ivanov 2017-11-22 15:34:08 +03:00
parent 59f647e5cc
commit 43cf000339
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,6 +384,16 @@ public class SpannableTheme {
return tableCellPadding; return tableCellPadding;
} }
public int tableBorderWidth(@NonNull Paint paint) {
final int out;
if (tableBorderWidth == -1) {
out = (int) (paint.getStrokeWidth() + .5F);
} else {
out = tableBorderWidth;
}
return out;
}
public void applyTableBorderStyle(@NonNull Paint paint) { public void applyTableBorderStyle(@NonNull Paint paint) {
final int color; final int color;
@ -393,10 +403,6 @@ public class SpannableTheme {
color = tableBorderColor; color = tableBorderColor;
} }
if (tableBorderWidth != 0) {
paint.setStrokeWidth(tableBorderWidth);
}
paint.setColor(color); paint.setColor(color);
paint.setStyle(Paint.Style.STROKE); paint.setStyle(Paint.Style.STROKE);
} }
@ -442,7 +448,7 @@ public class SpannableTheme {
private int thematicBreakHeight = -1; private int thematicBreakHeight = -1;
private int tableCellPadding; private int tableCellPadding;
private int tableBorderColor; private int tableBorderColor;
private int tableBorderWidth; private int tableBorderWidth = -1;
private int tableOddRowBackgroundColor; private int tableOddRowBackgroundColor;
private Drawable taskListDrawable; private Drawable taskListDrawable;

13
library/src/main/java/ru/noties/markwon/spans/TableRowSpan.java
View File

@ -169,10 +169,14 @@ public class TableRowSpan extends ReplacementSpan {
} }
} }
rect.set(0, 0, w, bottom - top);
theme.applyTableBorderStyle(this.paint); theme.applyTableBorderStyle(this.paint);
final int borderWidth = theme.tableBorderWidth(paint);
final boolean drawBorder = borderWidth > 0;
if (drawBorder) {
rect.set(0, 0, w, bottom - top);
}
StaticLayout layout; StaticLayout layout;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
layout = layouts.get(i); layout = layouts.get(i);
@ -180,7 +184,10 @@ public class TableRowSpan extends ReplacementSpan {
try { try {
canvas.translate(x + (i * w), top - heightDiff); canvas.translate(x + (i * w), top - heightDiff);
canvas.drawRect(rect, this.paint);
if (drawBorder) {
canvas.drawRect(rect, this.paint);
}
canvas.translate(padding, padding + heightDiff); canvas.translate(padding, padding + heightDiff);
layout.draw(canvas); layout.draw(canvas);