[commit] r1357 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Jun 14 16:25:36 2011
New Revision: 1357

Log:
Simplify text drawing. Was clipping "0..*" in MetaGME/References when printing to EMF

Modified:
   trunk/GME/Gme/GraphicsUtil.cpp

Modified: trunk/GME/Gme/GraphicsUtil.cpp
==============================================================================
--- trunk/GME/Gme/GraphicsUtil.cpp	Tue Jun 14 16:23:40 2011	(r1356)
+++ trunk/GME/Gme/GraphicsUtil.cpp	Tue Jun 14 16:25:36 2011	(r1357)
@@ -480,28 +480,7 @@
 	Gdiplus::PointF pointF(static_cast<float> (pt.x),
 						   static_cast<float> (pt.y));
 
-	Gdiplus::RectF rectF;
-	gdip->MeasureString(txt, txt.GetLength(), font, pointF, &rectF);
-	Gdiplus::SizeF size;
-	rectF.GetSize(&size);
-	float xOffset = 0;
-	if ((align & TA_CENTER) == TA_CENTER) {
-		xOffset = -size.Width/2;
-	} else if ((align & TA_RIGHT) == TA_RIGHT) {
-		xOffset = -size.Width;
-	} else {	// TA_LEFT
-		// nothing
-	}
-	float yOffset = 0;
-	if ((align & TA_BASELINE) == TA_BASELINE) {
-		yOffset = -size.Height/2;
-	} else if ((align & TA_BOTTOM) == TA_BOTTOM) {
-		yOffset = -size.Height;
-	} else {	// TA_TOP
-		// nothing
-	}
-	rectF.Offset(xOffset, yOffset);
-	gdip->DrawString(txt, txt.GetLength(), font, rectF, &format, &textBrush);
+	gdip->DrawString(txt, txt.GetLength(), font, pointF, &format, &textBrush);
 }
 
 Gdiplus::RectF CGraphics::MeasureText2(Gdiplus::Graphics* gdip, const CString& txt, const CPoint& pt, Gdiplus::Font* font)