yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

added REM css size unit

Browse source
This commit is contained in:
Nikolay Pultsin 2014-09-08 18:49:15 +01:00
parent a6eff72604
commit 5b95c153b8
7 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
jni/NativeFormats/fbreader/src/formats/css/StyleSheetTable.cpp
View file

@ -54,6 +54,10 @@ static bool parseLength(const std::string &toParse, short &size, ZLTextStyleEntr
unit = ZLTextStyleEntry::SIZE_UNIT_PERCENT;
size = std::atoi(toParse.c_str());
return true;
} else if (ZLStringUtil::stringEndsWith(toParse, "rem")) {
unit = ZLTextStyleEntry::SIZE_UNIT_REM_100;
size = (short)(100 * ZLStringUtil::stringToDouble(toParse, 0));
return true;
} else if (ZLStringUtil::stringEndsWith(toParse, "em")) {
unit = ZLTextStyleEntry::SIZE_UNIT_EM_100;
size = (short)(100 * ZLStringUtil::stringToDouble(toParse, 0));

3
jni/NativeFormats/zlibrary/text/src/model/ZLTextParagraph.cpp
View file

@ -37,6 +37,9 @@ short ZLTextStyleEntry::length(Feature featureId, const Metrics &metrics) const
case SIZE_UNIT_PIXEL:
return myLengths[featureId].Size;
case SIZE_UNIT_EM_100:
// TODO: implement
return (myLengths[featureId].Size * metrics.FontSize + 50) / 100;
case SIZE_UNIT_REM_100:
return (myLengths[featureId].Size * metrics.FontSize + 50) / 100;
case SIZE_UNIT_EX_100:
return (myLengths[featureId].Size * metrics.FontXHeight + 50) / 100;

1
jni/NativeFormats/zlibrary/text/src/model/ZLTextStyleEntry.h
View file

@ -36,6 +36,7 @@ public:
SIZE_UNIT_PIXEL,
SIZE_UNIT_POINT,
SIZE_UNIT_EM_100,
SIZE_UNIT_REM_100,
SIZE_UNIT_EX_100,
SIZE_UNIT_PERCENT
};

4
src/org/geometerplus/zlibrary/text/model/ZLTextMetrics.java
View file

@ -23,11 +23,13 @@ public final class ZLTextMetrics {
public final int DPI;
public final int FullWidth;
public final int FullHeight;
public final int FontSize;
public ZLTextMetrics(int dpi, int fullWidth, int fullHeight) {
public ZLTextMetrics(int dpi, int fullWidth, int fullHeight, int fontSize) {
DPI = dpi;
FullWidth = fullWidth;
FullHeight = fullHeight;
FontSize = fontSize;
}
@Override

7
src/org/geometerplus/zlibrary/text/model/ZLTextStyleEntry.java
View file

@ -55,8 +55,9 @@ public abstract class ZLTextStyleEntry {
byte PIXEL = 0;
byte POINT = 1;
byte EM_100 = 2;
byte EX_100 = 3;
byte PERCENT = 4;
byte REM_100 = 3;
byte EX_100 = 4;
byte PERCENT = 5;
// TODO: add IN, CM, MM, PICA ("pc", = 12 POINT)
}
@ -127,6 +128,8 @@ public abstract class ZLTextStyleEntry {
return length.Size * metrics.DPI / 72;
case SizeUnit.EM_100:
return (length.Size * fontSize + 50) / 100;
case SizeUnit.REM_100:
return (length.Size * metrics.FontSize + 50) / 100;
case SizeUnit.EX_100:
// TODO 0.5 font size => height of x
return (length.Size * fontSize / 2 + 50) / 100;

3
src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
View file

@ -57,7 +57,8 @@ abstract class ZLTextViewBase extends ZLView {
// TODO: screen area width
100,
// TODO: screen area height
100
100,
getTextStyleCollection().getBaseStyle().getFontSize()
);
myMetrics = m;
}

5
src/org/geometerplus/zlibrary/text/view/style/ZLTextNGStyleDescription.java
View file

@ -226,6 +226,11 @@ public class ZLTextNGStyleDescription {
Short.valueOf(value.substring(0, value.length() - 1)),
ZLTextStyleEntry.SizeUnit.PERCENT
);
} else if (value.endsWith("rem")) {
length = new ZLTextStyleEntry.Length(
(short)(100 * Double.valueOf(value.substring(0, value.length() - 2))),
ZLTextStyleEntry.SizeUnit.REM_100
);
} else if (value.endsWith("em")) {
length = new ZLTextStyleEntry.Length(
(short)(100 * Double.valueOf(value.substring(0, value.length() - 2))),