Commit 52281e68 authored by twanvl's avatar twanvl

Fixed positioning of shrunk text in rotated dcs

parent 7194a0fd
...@@ -209,15 +209,16 @@ void RotatedDC::DrawText (const String& text, const RealPoint& pos, AColor colo ...@@ -209,15 +209,16 @@ void RotatedDC::DrawText (const String& text, const RealPoint& pos, AColor colo
RealRect r(pos, GetTextExtent(text)); RealRect r(pos, GetTextExtent(text));
RealRect r_ext = trRectToBB(r); RealRect r_ext = trRectToBB(r);
RealPoint pos2 = tr(pos); RealPoint pos2 = tr(pos);
if (zoomX != zoomY) { stretch_ *= getStretch();
r.width *= zoomX / zoomY; if (fabs(stretch_ - 1) > 1e-6) {
r.width *= stretch_;
RealRect r_ext2 = trRectToBB(r); RealRect r_ext2 = trRectToBB(r);
pos2.x += r_ext2.x - r_ext.x; pos2.x += r_ext2.x - r_ext.x;
pos2.y += r_ext2.y - r_ext.y; pos2.y += r_ext2.y - r_ext.y;
r_ext.x = r_ext2.x; r_ext.x = r_ext2.x;
r_ext.y = r_ext2.y; r_ext.y = r_ext2.y;
} }
draw_resampled_text(dc, pos2, r_ext, stretch_ * getStretch(), angle, color, text, blur_radius, boldness); draw_resampled_text(dc, pos2, r_ext, stretch_, angle, color, text, blur_radius, boldness);
} else if (quality >= QUALITY_SUB_PIXEL) { } else if (quality >= QUALITY_SUB_PIXEL) {
RealPoint p_ext = tr(pos)*text_scaling; RealPoint p_ext = tr(pos)*text_scaling;
double usx,usy; double usx,usy;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment