Changeset 10349 for trunk/src/gdi32/oslibgpi.cpp

Timestamp:

Dec 1, 2003, 2:27:39 PM (22 years ago)

Author:

sandervl

Message:

Updates

File:

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

trunk/src/gdi32/oslibgpi.cpp

@@ -1 @@
-/* $Id: oslibgpi.cpp,v 1.14 2003-07-16 15:47:37 sandervl Exp $ */
+/* $Id: oslibgpi.cpp,v 1.15 2003-12-01 13:27:39 sandervl Exp $ */
 
 /*
@@ -257 +257 @@
   ULONG    cy;
 
+  //ignore underhang (just like GetTextExtentPoint does in Windows)
+  if (box[TXTBOX_BOTTOMLEFT].x < 0) {
+      dprintf(("WARNING: Ignoring underhang!!"));
+      box[TXTBOX_BOTTOMLEFT].x = 0;
+  }
+
   if (box[TXTBOX_BOTTOMLEFT].y == box[TXTBOX_BOTTOMRIGHT].y)
   {
     point->y = labs (box[TXTBOX_BOTTOMLEFT].y-box[TXTBOX_TOPLEFT].y) + 1;
-    point->x = labs (box[TXTBOX_BOTTOMRIGHT].x-box[TXTBOX_BOTTOMLEFT].x) + 1;
+    point->x = labs (box[TXTBOX_CONCAT].x - box[TXTBOX_BOTTOMLEFT].x);
+
     if (box[TXTBOX_BOTTOMLEFT].x != box[TXTBOX_TOPLEFT].x)
     {