r21174 by fschmid -
scribus-commit
scribus-commit at lists.scribus.net
Sat Apr 9 10:01:50 UTC 2016
Author: fschmid
Date: Sat Apr 9 10:01:50 2016
New Revision: 21174
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21174
Log:
Fixed Bug #13460: Setting vertical scale for text above 100% causes strange rendering
Modified:
trunk/Scribus/scribus/pageitem_textframe.cpp
trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21174&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Sat Apr 9 10:01:50 2016
@@ -1796,12 +1796,10 @@
{
foreach (GlyphLayout gl, glyphRuns[i].glyphs()) {
GlyphMetrics gm = font.glyphBBox(gl.glyph, hlcsize10);
- realDesc = qMax(realDesc, gm.descent);
+ realDesc = qMax(realDesc, gm.descent * scaleV - offset);
realAsce = gm.ascent;
}
}
-
- realDesc = realDesc * scaleV - offset;
desc = -font.descent(hlcsize10);
current.rememberShrinkStretch(itemText.text(a), wide, style);
}
Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21174&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp Sat Apr 9 10:01:50 2016
@@ -498,7 +498,7 @@
token = getToken();
if (token == "$")
token = "100";
-// currentCharStyle.setScaleV(token.toDouble() * 10.0);
+ currentCharStyle.setScaleV(token.toDouble() * 10.0);
}
void XtgScanner::setLigatures()
More information about the scribus-commit
mailing list