diff --git a/ChangeLog b/ChangeLog
index 1eeb88add..ddc6dc238 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+===== 1.3.8 (Feb ??, 2012) =====
+* striked through/underlined text support
+
===== 1.3.7 (Feb 9, 2012) =====
* Font smoothing settings (Settings -> Text -> Font properties)
* Fixed 'question symbols in menu' issue
diff --git a/assets/default/styles.xml b/assets/default/styles.xml
index 1a7e74437..6680a8b96 100644
--- a/assets/default/styles.xml
+++ b/assets/default/styles.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml
index a192e1bbf..cdf2cdada 100644
--- a/assets/resources/application/cs.xml
+++ b/assets/resources/application/cs.xml
@@ -383,13 +383,13 @@
-
-
+
+
-
-
+
+
@@ -407,8 +407,8 @@
-
-
+
+
diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml
index f9016f68a..c470eef87 100644
--- a/assets/resources/application/de.xml
+++ b/assets/resources/application/de.xml
@@ -363,13 +363,13 @@
-
-
+
+
-
-
+
+
@@ -387,8 +387,8 @@
-
-
+
+
diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml
index e7df0d8f0..e66947024 100644
--- a/assets/resources/application/en.xml
+++ b/assets/resources/application/en.xml
@@ -389,13 +389,23 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -413,8 +423,8 @@
-
-
+
+
diff --git a/assets/resources/application/es.xml b/assets/resources/application/es.xml
index f51ea4f8f..912acaacb 100644
--- a/assets/resources/application/es.xml
+++ b/assets/resources/application/es.xml
@@ -365,13 +365,13 @@
-
-
+
+
-
-
+
+
@@ -389,8 +389,8 @@
-
-
+
+
diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml
index 78f41f6ba..d9b2ba876 100644
--- a/assets/resources/application/fr.xml
+++ b/assets/resources/application/fr.xml
@@ -363,13 +363,13 @@
-
-
+
+
-
-
+
+
@@ -387,8 +387,8 @@
-
-
+
+
diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml
index d214c941f..a396f0328 100644
--- a/assets/resources/application/gl.xml
+++ b/assets/resources/application/gl.xml
@@ -360,13 +360,13 @@
-
-
+
+
-
-
+
+
@@ -384,8 +384,8 @@
-
-
+
+
diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml
index 5945e5e0f..e31736622 100644
--- a/assets/resources/application/hu.xml
+++ b/assets/resources/application/hu.xml
@@ -360,13 +360,13 @@
-
-
+
+
-
-
+
+
@@ -384,8 +384,8 @@
-
-
+
+
diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml
index ae4ef9582..ce38b7d6c 100644
--- a/assets/resources/application/it.xml
+++ b/assets/resources/application/it.xml
@@ -361,13 +361,13 @@
-
-
+
+
-
-
+
+
@@ -385,8 +385,8 @@
-
-
+
+
diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml
index 7c6c2dfc2..d9f08f236 100644
--- a/assets/resources/application/nl.xml
+++ b/assets/resources/application/nl.xml
@@ -360,13 +360,13 @@
-
-
+
+
-
-
+
+
@@ -384,8 +384,8 @@
-
-
+
+
diff --git a/assets/resources/application/pl.xml b/assets/resources/application/pl.xml
index 348de0b8c..455811137 100644
--- a/assets/resources/application/pl.xml
+++ b/assets/resources/application/pl.xml
@@ -360,13 +360,13 @@
-
-
+
+
-
-
+
+
@@ -384,8 +384,8 @@
-
-
+
+
diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml
index eed898ddd..bffa19e64 100644
--- a/assets/resources/application/ro.xml
+++ b/assets/resources/application/ro.xml
@@ -360,13 +360,13 @@
-
-
+
+
-
-
+
+
@@ -384,8 +384,8 @@
-
-
+
+
diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml
index 1e87b3bbf..867d7a596 100644
--- a/assets/resources/application/ru.xml
+++ b/assets/resources/application/ru.xml
@@ -400,14 +400,24 @@
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -424,8 +434,8 @@
-
-
+
+
diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml
index f7ead90b7..0c096d1f6 100644
--- a/assets/resources/application/th.xml
+++ b/assets/resources/application/th.xml
@@ -360,13 +360,13 @@
-
-
+
+
-
-
+
+
@@ -384,8 +384,8 @@
-
-
+
+
diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml
index 9088dda95..e229369ad 100644
--- a/assets/resources/application/uk.xml
+++ b/assets/resources/application/uk.xml
@@ -360,13 +360,13 @@
-
-
+
+
-
-
+
+
@@ -384,8 +384,8 @@
-
-
+
+
diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml
index 3f4341529..b484acd78 100644
--- a/assets/resources/application/vi.xml
+++ b/assets/resources/application/vi.xml
@@ -360,13 +360,13 @@
-
-
+
+
-
-
+
+
@@ -384,8 +384,8 @@
-
-
+
+
diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml
index 7a8e041f9..3c922d9ae 100644
--- a/assets/resources/application/zh.xml
+++ b/assets/resources/application/zh.xml
@@ -360,13 +360,13 @@
-
-
+
+
-
-
+
+
@@ -384,8 +384,8 @@
-
-
+
+
diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml
index 60a42e497..067561103 100644
--- a/assets/resources/application/zh_TW.xml
+++ b/assets/resources/application/zh_TW.xml
@@ -365,13 +365,13 @@
-
-
+
+
-
-
+
+
@@ -389,8 +389,8 @@
-
-
+
+
diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
index 28a589d34..442b01477 100644
--- a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
+++ b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
@@ -115,6 +115,8 @@ public class PreferenceActivity extends ZLPreferenceActivity {
this, textScreen.Resource, "fontStyle",
baseStyle.BoldOption, baseStyle.ItalicOption
));
+ textScreen.addOption(baseStyle.UnderlineOption, "underlined");
+ textScreen.addOption(baseStyle.StrikeThroughOption, "strikedThrough");
final ZLIntegerRangeOption spaceOption = baseStyle.LineSpaceOption;
final String[] spacings = new String[spaceOption.MaxValue - spaceOption.MinValue + 1];
for (int i = 0; i < spacings.length; ++i) {
@@ -190,6 +192,14 @@ public class PreferenceActivity extends ZLPreferenceActivity {
this, textScreen.Resource, "italic",
decoration.ItalicOption
));
+ formatScreen.addPreference(new ZLBoolean3Preference(
+ this, textScreen.Resource, "underlined",
+ decoration.UnderlineOption
+ ));
+ formatScreen.addPreference(new ZLBoolean3Preference(
+ this, textScreen.Resource, "strikedThrough",
+ decoration.StrikeThroughOption
+ ));
if (fullDecoration != null) {
final String[] allAlignments = { "unchanged", "left", "right", "center", "justify" };
formatScreen.addPreference(new ZLChoicePreference(
diff --git a/src/org/geometerplus/android/fbreader/preferences/ZLBoolean3Preference.java b/src/org/geometerplus/android/fbreader/preferences/ZLBoolean3Preference.java
index 729b6b111..d0d82ba1a 100644
--- a/src/org/geometerplus/android/fbreader/preferences/ZLBoolean3Preference.java
+++ b/src/org/geometerplus/android/fbreader/preferences/ZLBoolean3Preference.java
@@ -26,8 +26,8 @@ import org.geometerplus.zlibrary.core.options.ZLBoolean3Option;
import org.geometerplus.zlibrary.core.resources.ZLResource;
class ZLBoolean3Preference extends ZLStringListPreference {
- private static final String ON = "on";
- private static final String OFF = "off";
+ private static final String ON = "summaryOn";
+ private static final String OFF = "summaryOff";
private static final String UNCHANGED = "unchanged";
private final ZLBoolean3Option myOption;
diff --git a/src/org/geometerplus/fbreader/fbreader/FBView.java b/src/org/geometerplus/fbreader/fbreader/FBView.java
index 61afa5d47..5ecba881a 100644
--- a/src/org/geometerplus/fbreader/fbreader/FBView.java
+++ b/src/org/geometerplus/fbreader/fbreader/FBView.java
@@ -468,7 +468,7 @@ public final class FBView extends ZLTextView {
context.setFont(
reader.FooterFontOption.getValue(),
height <= 10 ? height + 3 : height + 1,
- height > 10, false, false
+ height > 10, false, false, false
);
final PagePosition pagePosition = FBView.this.pagePosition();
diff --git a/src/org/geometerplus/zlibrary/core/view/DummyPaintContext.java b/src/org/geometerplus/zlibrary/core/view/DummyPaintContext.java
index cbab18d74..b5bad39a6 100644
--- a/src/org/geometerplus/zlibrary/core/view/DummyPaintContext.java
+++ b/src/org/geometerplus/zlibrary/core/view/DummyPaintContext.java
@@ -43,7 +43,7 @@ final class DummyPaintContext extends ZLPaintContext {
}
@Override
- protected void setFontInternal(String family, int size, boolean bold, boolean italic, boolean underline) {
+ protected void setFontInternal(String family, int size, boolean bold, boolean italic, boolean underline, boolean strikeThrought) {
}
@Override
diff --git a/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java b/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java
index 0dbac02b3..d5502f8b3 100644
--- a/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java
+++ b/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java
@@ -51,8 +51,9 @@ abstract public class ZLPaintContext {
private boolean myFontIsBold;
private boolean myFontIsItalic;
private boolean myFontIsUnderlined;
+ private boolean myFontIsStrikedThrough;
- public final void setFont(String family, int size, boolean bold, boolean italic, boolean underline) {
+ public final void setFont(String family, int size, boolean bold, boolean italic, boolean underline, boolean strikeThrough) {
if ((family != null) && !myFontFamily.equals(family)) {
myFontFamily = family;
myResetFont = true;
@@ -73,16 +74,20 @@ abstract public class ZLPaintContext {
myFontIsUnderlined = underline;
myResetFont = true;
}
+ if (myFontIsStrikedThrough != strikeThrough) {
+ myFontIsStrikedThrough = strikeThrough;
+ myResetFont = true;
+ }
if (myResetFont) {
myResetFont = false;
- setFontInternal(myFontFamily, size, bold, italic, underline);
+ setFontInternal(myFontFamily, size, bold, italic, underline, strikeThrough);
mySpaceWidth = -1;
myStringHeight = -1;
myDescent = -1;
}
}
- abstract protected void setFontInternal(String family, int size, boolean bold, boolean italic, boolean underline);
+ abstract protected void setFontInternal(String family, int size, boolean bold, boolean italic, boolean underline, boolean strikeThrough);
abstract public void setTextColor(ZLColor color);
final public void setLineColor(ZLColor color) {
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java b/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java
index 20bf8c301..c6fb8c7c1 100644
--- a/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java
+++ b/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java
@@ -34,6 +34,7 @@ public abstract class ZLTextStyle {
public abstract boolean isBold();
public abstract boolean isItalic();
public abstract boolean isUnderline();
+ public abstract boolean isStrikeThrough();
public abstract int getLeftIndent();
public abstract int getRightIndent();
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java b/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
index b3abea274..216947720 100644
--- a/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
+++ b/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
@@ -86,7 +86,7 @@ abstract class ZLTextViewBase extends ZLView {
myTextStyle = style;
myWordHeight = -1;
}
- myContext.setFont(style.getFontFamily(), style.getFontSize(), style.isBold(), style.isItalic(), style.isUnderline());
+ myContext.setFont(style.getFontFamily(), style.getFontSize(), style.isBold(), style.isItalic(), style.isUnderline(), style.isStrikeThrough());
}
final void resetTextStyle() {
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
index 4cc595ab9..a6b5098d9 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
@@ -39,6 +39,8 @@ public class ZLTextBaseStyle extends ZLTextStyle {
new ZLBooleanOption(GROUP, "Base:italic", false);
public final ZLBooleanOption UnderlineOption =
new ZLBooleanOption(GROUP, "Base:underline", false);
+ public final ZLBooleanOption StrikeThroughOption =
+ new ZLBooleanOption(GROUP, "Base:strikeThrough", false);
public final ZLIntegerRangeOption AlignmentOption =
new ZLIntegerRangeOption(GROUP, "Base:alignment", 1, 4, ZLTextAlignmentType.ALIGN_JUSTIFY);
public final ZLIntegerRangeOption LineSpaceOption =
@@ -79,6 +81,11 @@ public class ZLTextBaseStyle extends ZLTextStyle {
return UnderlineOption.getValue();
}
+ @Override
+ public boolean isStrikeThrough() {
+ return StrikeThroughOption.getValue();
+ }
+
@Override
public int getLeftIndent() {
return 0;
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java
index ff30a093e..55936640d 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java
@@ -29,6 +29,7 @@ public abstract class ZLTextDecoratedStyle extends ZLTextStyle {
private boolean myIsItalic;
private boolean myIsBold;
private boolean myIsUnderline;
+ private boolean myIsStrikeThrough;
private int myVerticalShift;
private boolean myIsNotCached = true;
@@ -43,6 +44,7 @@ public abstract class ZLTextDecoratedStyle extends ZLTextStyle {
myIsItalic = isItalicInternal();
myIsBold = isBoldInternal();
myIsUnderline = isUnderlineInternal();
+ myIsStrikeThrough = isStrikeThroughInternal();
myVerticalShift = getVerticalShiftInternal();
myIsNotCached = false;
@@ -93,6 +95,15 @@ public abstract class ZLTextDecoratedStyle extends ZLTextStyle {
}
protected abstract boolean isUnderlineInternal();
+ @Override
+ public final boolean isStrikeThrough() {
+ if (myIsNotCached) {
+ initCache();
+ }
+ return myIsStrikeThrough;
+ }
+ protected abstract boolean isStrikeThroughInternal();
+
@Override
public final int getVerticalShift() {
if (myIsNotCached) {
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java
index 29854dfd8..97d0c646a 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java
@@ -37,8 +37,8 @@ public class ZLTextFullStyleDecoration extends ZLTextStyleDecoration {
public final ZLIntegerOption LineSpacePercentOption;
- public ZLTextFullStyleDecoration(String name, int fontSizeDelta, ZLBoolean3 bold, ZLBoolean3 italic, ZLBoolean3 underline, int spaceBefore, int spaceAfter, int leftIndent,int rightIndent, int firstLineIndentDelta, int verticalShift, byte alignment, int lineSpace, ZLBoolean3 allowHyphenations) {
- super(name, fontSizeDelta, bold, italic, underline, verticalShift, allowHyphenations);
+ public ZLTextFullStyleDecoration(String name, int fontSizeDelta, ZLBoolean3 bold, ZLBoolean3 italic, ZLBoolean3 underline, ZLBoolean3 strikeThrough, int spaceBefore, int spaceAfter, int leftIndent,int rightIndent, int firstLineIndentDelta, int verticalShift, byte alignment, int lineSpace, ZLBoolean3 allowHyphenations) {
+ super(name, fontSizeDelta, bold, italic, underline, strikeThrough, verticalShift, allowHyphenations);
SpaceBeforeOption = new ZLIntegerRangeOption(STYLE, name + ":spaceBefore", -10, 100, spaceBefore);
SpaceAfterOption = new ZLIntegerRangeOption(STYLE, name + ":spaceAfter", -10, 100, spaceAfter);
LeftIndentOption = new ZLIntegerRangeOption(STYLE, name + ":leftIndent", -300, 300, leftIndent);
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java
index 4b6430202..e3e4294a6 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java
@@ -77,6 +77,18 @@ class ZLTextPartialDecoratedStyle extends ZLTextDecoratedStyle {
}
}
+ @Override
+ protected boolean isStrikeThroughInternal() {
+ switch (myDecoration.StrikeThroughOption.getValue()) {
+ case B3_TRUE:
+ return true;
+ case B3_FALSE:
+ return false;
+ default:
+ return Base.isStrikeThrough();
+ }
+ }
+
@Override
public int getLeftIndent() {
return Base.getLeftIndent();
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java
index 6cbc712fa..e3ff43233 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java
@@ -101,11 +101,12 @@ public class ZLTextStyleCollection {
ZLBoolean3 bold = b3Value(attributes, "bold");
ZLBoolean3 italic = b3Value(attributes, "italic");
ZLBoolean3 underline = b3Value(attributes, "underline");
+ ZLBoolean3 strikeThrough = b3Value(attributes, "strikeThrough");
int verticalShift = intValue(attributes, "vShift", 0);
ZLBoolean3 allowHyphenations = b3Value(attributes, "allowHyphenations");
if (booleanValue(attributes, "partial")) {
- decoration = new ZLTextStyleDecoration(name, fontSizeDelta, bold, italic, underline, verticalShift, allowHyphenations);
+ decoration = new ZLTextStyleDecoration(name, fontSizeDelta, bold, italic, underline, strikeThrough, verticalShift, allowHyphenations);
} else {
int spaceBefore = intValue(attributes, "spaceBefore", 0);
int spaceAfter = intValue(attributes, "spaceAfter", 0);
@@ -128,7 +129,7 @@ public class ZLTextStyleCollection {
}
final int lineSpacePercent = intValue(attributes, "lineSpacingPercent", -1);
- decoration = new ZLTextFullStyleDecoration(name, fontSizeDelta, bold, italic, underline, spaceBefore, spaceAfter, leftIndent, rightIndent, firstLineIndentDelta, verticalShift, alignment, lineSpacePercent, allowHyphenations);
+ decoration = new ZLTextFullStyleDecoration(name, fontSizeDelta, bold, italic, underline, strikeThrough, spaceBefore, spaceAfter, leftIndent, rightIndent, firstLineIndentDelta, verticalShift, alignment, lineSpacePercent, allowHyphenations);
}
String fontFamily = attributes.getValue("family");
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java
index 34308ca06..81322e934 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java
@@ -33,18 +33,20 @@ public class ZLTextStyleDecoration {
public final ZLBoolean3Option BoldOption;
public final ZLBoolean3Option ItalicOption;
public final ZLBoolean3Option UnderlineOption;
+ public final ZLBoolean3Option StrikeThroughOption;
public final ZLIntegerOption VerticalShiftOption;
public final ZLBoolean3Option AllowHyphenationsOption;
private final String myName;
- public ZLTextStyleDecoration(String name, int fontSizeDelta, ZLBoolean3 bold, ZLBoolean3 italic, ZLBoolean3 underline, int verticalShift, ZLBoolean3 allowHyphenations) {
+ public ZLTextStyleDecoration(String name, int fontSizeDelta, ZLBoolean3 bold, ZLBoolean3 italic, ZLBoolean3 underline, ZLBoolean3 strikeThrough, int verticalShift, ZLBoolean3 allowHyphenations) {
myName = name;
FontFamilyOption = new ZLStringOption(STYLE, name + ":fontFamily", "");
FontSizeDeltaOption = new ZLIntegerRangeOption(STYLE, name + ":fontSize", -16, 16, fontSizeDelta);
BoldOption = new ZLBoolean3Option(STYLE, name + ":bold", bold);
ItalicOption = new ZLBoolean3Option(STYLE, name + ":italic", italic);
UnderlineOption = new ZLBoolean3Option(STYLE, name + ":underline", underline);
+ StrikeThroughOption = new ZLBoolean3Option(STYLE, name + ":strikeThrough", strikeThrough);
VerticalShiftOption = new ZLIntegerOption(STYLE, name + ":vShift", verticalShift);
AllowHyphenationsOption = new ZLBoolean3Option(STYLE, name + ":allowHyphenations", allowHyphenations);
}
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
index 675a0601b..333df07df 100644
--- a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
+++ b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
@@ -190,7 +190,7 @@ public final class ZLAndroidPaintContext extends ZLPaintContext {
myCanvas.drawPath(path, myOutlinePaint);
}
- protected void setFontInternal(String family, int size, boolean bold, boolean italic, boolean underline) {
+ protected void setFontInternal(String family, int size, boolean bold, boolean italic, boolean underline, boolean strikeThrought) {
family = realFontFamilyName(family);
final int style = (bold ? Typeface.BOLD : 0) | (italic ? Typeface.ITALIC : 0);
Typeface[] typefaces = myTypefaces.get(family);
@@ -226,6 +226,7 @@ public final class ZLAndroidPaintContext extends ZLPaintContext {
myTextPaint.setTypeface(tf);
myTextPaint.setTextSize(size);
myTextPaint.setUnderlineText(underline);
+ myTextPaint.setStrikeThruText(strikeThrought);
}
@Override