medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Support <percentage> and <relative-size> values for "font-size" property

Browse source
This commit is contained in:
Slava Monich 2015-07-03 15:22:54 +03:00
parent 74d70a9d3a
commit 220f4feaa3
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
fbreader/fbreader/fbreader/src/formats/css/StyleSheetTable.cpp
View file

@ -183,24 +183,31 @@ shared_ptr<ZLTextStyleEntry> StyleSheetTable::createControl(const AttributeMap &
const std::vector<std::string> &fontSize = values(styles, "font-size"); const std::vector<std::string> &fontSize = values(styles, "font-size");
if (!fontSize.empty()) { if (!fontSize.empty()) {
if (fontSize[0] == "xx-small") { std::string value = fontSize[0];
if (value == "xx-small") {
entry->setFontSizeMag(-3); entry->setFontSizeMag(-3);
} else if (fontSize[0] == "x-small") { } else if (value == "x-small") {
entry->setFontSizeMag(-2); entry->setFontSizeMag(-2);
} else if (fontSize[0] == "small") { } else if (value == "small" || value == "smaller") {
entry->setFontSizeMag(-1); entry->setFontSizeMag(-1);
} else if (fontSize[0] == "medium") { } else if (value == "medium") {
entry->setFontSizeMag(0); entry->setFontSizeMag(0);
} else if (fontSize[0] == "large") { } else if (value == "large" || value == "larger") {
entry->setFontSizeMag(1); entry->setFontSizeMag(1);
} else if (fontSize[0] == "x-large") { } else if (value == "x-large") {
entry->setFontSizeMag(2); entry->setFontSizeMag(2);
} else if (fontSize[0] == "xx-large") { } else if (value == "xx-large") {
entry->setFontSizeMag(3); entry->setFontSizeMag(3);
} else if (value.size() > 1 && value[value.size()-1] == '%') {
value.erase(value.size()-1, 1);
int percent = atoi(value.c_str());
if (percent > 0) {
entry->setFontSizeMag((percent - 100)/20);
}
} }
} }
std::vector<std::string> margins(values(styles, "margin")); std::vector<std::string> margins = values(styles, "margin");
if (!margins.empty() && margins.back() == "!important") { if (!margins.empty() && margins.back() == "!important") {
// Ignore the "!important" modifier for now // Ignore the "!important" modifier for now
margins.pop_back(); margins.pop_back();