Changeset 3368

Timestamp:

2004年07月24日 10時06分11秒 (4 years ago)

Author:

miyoshi

Message:

(mw32_set_windows_logical_font): If the font width is
not desired, adjust `lfWidth' and recreate it later.
(mw32_convert_lface_to_LOGFONT): Set lfHeight to positive value.
(mw32_initialize_default_logfont): The height is explicitly set
here to avoid the annoying variable font width.

Files:

• branches/2.1/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/src/mw32font.c (modified) (3 diffs)

branches/2.1/src/ChangeLog.Meadow

@@ +1 @@
+2004-07-24  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * mw32font.c (mw32_set_windows_logical_font): If the font width is
+        not desired, adjust `lfWidth' and recreate it later.
+        (mw32_convert_lface_to_LOGFONT): Set lfHeight to positive value.
+        (mw32_initialize_default_logfont): The height is explicitly set
+        here to avoid the annoying variable font width.
+
-2004-07-20  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.1/src/mw32font.c

@@ -408 +408 @@
-          return 0;
-        }
+      /* If the font width is not desired, adjust `lfWidth' and
+         recreate it later. */
+      if (plogf->lfWidth != 0 && plogf->lfWidth != tm.tmAveCharWidth)
+        {
+          int target_width = plogf->lfWidth;
+          plogf->lfWidth = plogf->lfWidth * plogf->lfWidth / tm.tmAveCharWidth;
+          tm.tmAveCharWidth = target_width;
+          DeleteObject (hf);
+          hf = INVALID_HANDLE_VALUE;
+        }
+      
-      pwf->pfont = hf;
-
@@ -1757 +1768 @@
-      else if (FLOATP (elt))
-        pt = (int) XFLOATINT (elt);
-
+
+
+
-    }
-
@@ -1836 +1849 @@
-  static LOGFONT default_logfont =
-    {
-
+
+
+
-      OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
-      FF_DONTCARE | FIXED_PITCH, ""