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

Fix table row span width calculation

Browse Source
This commit is contained in:
Dimitry Ivanov 2020-04-28 19:19:38 +03:00
parent 5451a2722e
commit 851172a785
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -72,7 +72,7 @@ ext {
'commonmark-table' : "com.atlassian.commonmark:commonmark-ext-gfm-tables:$commonMarkVersion", 'commonmark-table' : "com.atlassian.commonmark:commonmark-ext-gfm-tables:$commonMarkVersion",
'android-svg' : 'com.caverock:androidsvg:1.4', 'android-svg' : 'com.caverock:androidsvg:1.4',
'android-gif' : 'pl.droidsonroids.gif:android-gif-drawable:1.2.15', 'android-gif' : 'pl.droidsonroids.gif:android-gif-drawable:1.2.15',
'jlatexmath-android' : 'ru.noties:jlatexmath-android:0.1.2', 'jlatexmath-android' : 'ru.noties:jlatexmath-android:0.2.0-SNAPSHOT',
'okhttp' : 'com.squareup.okhttp3:okhttp:3.9.0', 'okhttp' : 'com.squareup.okhttp3:okhttp:3.9.0',
'prism4j' : 'io.noties:prism4j:2.0.0', 'prism4j' : 'io.noties:prism4j:2.0.0',
'debug' : 'io.noties:debug:5.0.0@jar', 'debug' : 'io.noties:debug:5.0.0@jar',

5
markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableRowSpan.java
View File

@ -151,8 +151,9 @@ public class TableRowSpan extends ReplacementSpan {
int bottom, int bottom,
@NonNull Paint p) { @NonNull Paint p) {
if (recreateLayouts(SpanUtils.width(canvas, text))) { final int spanWidth = SpanUtils.width(canvas, text);
width = canvas.getWidth(); if (recreateLayouts(spanWidth)) {
width = spanWidth;
// @since 4.3.1 it's important to cast to TextPaint in order to display links, etc // @since 4.3.1 it's important to cast to TextPaint in order to display links, etc
if (p instanceof TextPaint) { if (p instanceof TextPaint) {
// there must be a reason why this method receives Paint instead of TextPaint... // there must be a reason why this method receives Paint instead of TextPaint...

1
sample/src/main/res/layout/activity_text_view.xml
View File

@ -14,6 +14,7 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#000" android:textColor="#000"
android:textSize="16sp" android:textSize="16sp"
android:padding="8dip"
tools:text="whatever" /> tools:text="whatever" />
</ScrollView> </ScrollView>