Changeset 9609 for trunk/src

Timestamp:

Jan 4, 2003, 2:45:10 PM (23 years ago)

Author:

sandervl

Message:

Removed broken handling of TA_RIGHT in TextOut

File:

• trunk/src/gdi32/text.cpp (modified) (2 diffs)

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.30 2002-06-25 07:21:03 sandervl Exp $ */
+/* $Id: text.cpp,v 1.31 2003-01-04 13:45:10 sandervl Exp $ */
 
 /*
@@ -183 +183 @@
   LONG pmHAlign,pmVAlign;
 
+#if 0
+  //SvL: This code is broken. TODO: Investigate
   //CB: TA_RIGHT not supported by PM, only TA_CENTER and TA_LEFT
   if ((align & 0x6) == TA_RIGHT)
   {
+    BOOL rc;
     PPOINTLOS2 pts = (PPOINTLOS2)malloc((cbCount+1)*sizeof(POINTLOS2));
-
-    OSLibGpiQueryCharStringPosAt(pHps,&ptl,flOptions,cbCount,lpszString,lpDx,pts);
-    ptl.x -= pts[cbCount].x-pts[0].x;
+ 
+    rc = OSLibGpiQueryCharStringPosAt(pHps,&ptl,flOptions & CHSOS_VECTOR,cbCount,lpszString,lpDx,pts);
+    if(rc) {
+        for(int i=0;i<cbCount+1;i++) {
+            dprintf(("OSLibGpiQueryCharStringPosAt %d (%d,%d)", pts[i].x, pts[i].y));
+        }
+        ptl.x -= pts[cbCount].x-pts[0].x;
+    }
     free(pts);
   }
+#endif
 
   if (lprc && ((align & 0x18) == TA_BASELINE))