------------------------------------------------------------
revno: 3147
committer: poy <p...@123gen.com>
branch nick: trunk
timestamp: Fri 2012-12-07 16:56:00 +0100
message:
Rich Edits' RTF parser handles DPI conversions
modified:
win32/HtmlToRtf.cpp
--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk
Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'win32/HtmlToRtf.cpp'
--- win32/HtmlToRtf.cpp 2012-10-27 14:16:21 +0000
+++ win32/HtmlToRtf.cpp 2012-12-07 15:56:00 +0000
@@ -198,7 +198,7 @@
// create a default context with the Rich Edit control's current formatting.
auto lf = box->getFont()->getLogFont();
font = parser.addFont("\\fnil\\fcharset" + Util::toString(lf.lfCharSet) + " " + Text::fromT(lf.lfFaceName));
- fontSize = rtfFontSize(abs(lf.lfHeight));
+ fontSize = rtfFontSize(static_cast<float>(abs(lf.lfHeight)) / dwt::util::dpiFactor());
if(lf.lfWeight >= FW_BOLD) { setFlag(Bold); }
if(lf.lfItalic) { setFlag(Italic); }
@@ -238,6 +238,7 @@
}
int Parser::rtfFontSize(float px) {
+ // the px value must not take DPI settings into account; the Rich Edit control handles that.
return std::floor(px
* 72.0 / 96.0 // px -> font points
* 2.0); // RTF font sizes are expressed in half-points
@@ -283,7 +284,7 @@
/// @todo handle more than px sizes
auto& size = *(l.end() - 2);
if(size.size() > 2 && *(size.end() - 2) == 'p' && *(size.end() - 1) == 'x') { // 16px
- contexts.back().fontSize = rtfFontSize(Util::toFloat(size.substr(0, size.size() - 2)) * dwt::util::dpiFactor());
+ contexts.back().fontSize = rtfFontSize(Util::toFloat(size.substr(0, size.size() - 2)));
}
// parse the optional third to last param (font weight).
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : linuxdcpp-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
