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

Timestamp:

Jul 16, 2003, 5:47:37 PM (22 years ago)

Author:

sandervl

Message:

KOM: Fixed GetTextFaceW() to support unicode correctly; Fixed calcDimensions

File:

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

trunk/src/gdi32/oslibgpi.cpp

@@ -1 @@
-/* $Id: oslibgpi.cpp,v 1.13 2003-01-28 16:21:48 sandervl Exp $ */
+/* $Id: oslibgpi.cpp,v 1.14 2003-07-16 15:47:37 sandervl Exp $ */
 
 /*
@@ -259 +259 @@
   if (box[TXTBOX_BOTTOMLEFT].y == box[TXTBOX_BOTTOMRIGHT].y)
   {
-    point->y = labs (box[TXTBOX_BOTTOMLEFT].y-box[TXTBOX_TOPLEFT].y);
-    point->x = labs (box[TXTBOX_BOTTOMRIGHT].x-box[TXTBOX_BOTTOMLEFT].x);
-
+    point->y = labs (box[TXTBOX_BOTTOMLEFT].y-box[TXTBOX_TOPLEFT].y) + 1;
+    point->x = labs (box[TXTBOX_BOTTOMRIGHT].x-box[TXTBOX_BOTTOMLEFT].x) + 1;
     if (box[TXTBOX_BOTTOMLEFT].x != box[TXTBOX_TOPLEFT].x)
     {
@@ -272 +271 @@
   } else
   {
-    cx = labs (box[TXTBOX_BOTTOMLEFT].x-box[TXTBOX_TOPLEFT].x);
-    cy = labs (box[TXTBOX_BOTTOMLEFT].y-box[TXTBOX_TOPLEFT].y);
+    cx = labs (box[TXTBOX_BOTTOMLEFT].x-box[TXTBOX_TOPLEFT].x) + 1;
+    cy = labs (box[TXTBOX_BOTTOMLEFT].y-box[TXTBOX_TOPLEFT].y) + 1;
     point->y = (ULONG)hypot(cx,cy);
 
-    cx = labs (box[TXTBOX_TOPRIGHT].x-box[TXTBOX_TOPLEFT].x);
-    cy = labs (box[TXTBOX_TOPRIGHT].y-box[TXTBOX_TOPLEFT].y);
+    cx = labs (box[TXTBOX_TOPRIGHT].x-box[TXTBOX_TOPLEFT].x) + 1;
+    cy = labs (box[TXTBOX_TOPRIGHT].y-box[TXTBOX_TOPLEFT].y) + 1;
     point->x  = (ULONG)hypot(cx,cy);
   }
@@ -400 +399 @@
 
 
-int OSLibGpiQueryFontMaxHeight(HDC hdc) 
+int OSLibGpiQueryFontMaxHeight(HDC hdc)
 {
   FONTMETRICS metrics;
@@ -407 +406 @@
   rc = GpiQueryFontMetrics(hdc, sizeof(metrics), &metrics);
   if(rc) {
-        return max(metrics.lMaxBaselineExt, 
-                   max(metrics.lMaxAscender+metrics.lMaxDescender, 
+    return max(metrics.lMaxBaselineExt,
+                   max(metrics.lMaxAscender+metrics.lMaxDescender,
                        metrics.lInternalLeading+metrics.lEmHeight));
   }
   else {
-        dprintf(("GpiQueryFontMetrics returned FALSE!!"));
-        return 0;
+    dprintf(("GpiQueryFontMetrics returned FALSE!!"));
+    return 0;
   }
 }
@@ -425 +424 @@
     if(!pHps)
     {
-        return;
+    return;
     }