From b779876fbcbd4b9584bc368626185dab669931f5 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sun, 16 Mar 2008 14:23:57 +0000
Subject: [PATCH] Pick fonts for tray and board based on sizes at runtime; bury
 tile values menuitem.

---
 wince/cedraw.c   | 47 ++++++++++++++++++++++++++++++++++++++++-------
 wince/cemain.h   | 11 ++++++++++-
 wince/xwords4.rc |  3 ++-
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/wince/cedraw.c b/wince/cedraw.c
index 9c749da92..fca7473b2 100755
--- a/wince/cedraw.c
+++ b/wince/cedraw.c
@@ -151,6 +151,27 @@ ERROR
 #endif
 } /* ceClipToRect */
 
+static HFONT
+ceGetSizedFont( CEDrawCtx* dctx, XP_U16 height, RFIndex index )
+{
+    if ( dctx->setFontHt[index] != height ) {
+        HFONT font;
+        LOGFONT fontInfo;
+
+        XP_MEMSET( &fontInfo, 0, sizeof(fontInfo) );
+        fontInfo.lfHeight = height;
+        font = CreateFontIndirect( &fontInfo );
+
+        if ( !!dctx->setFont[index] ) {
+            DeleteObject( dctx->setFont[index] );
+        }
+
+        dctx->setFont[index] = font;
+        dctx->setFontHt[index] = height;
+    }
+    return dctx->setFont[index];
+}
+
 static void
 measureText( CEDrawCtx* dctx, const XP_UCHAR* str, XP_S16 padding,
              XP_U16* widthP, XP_U16* heightP )
@@ -287,7 +308,6 @@ ceDrawHintBorders( HDC hdc, const XP_Rect* xprect, HintAtts hintAtts )
     }
 } /* ceDrawHintBorders */
 
-
 DLSTATIC XP_Bool
 DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect, 
                           const XP_UCHAR* letters, const XP_Bitmap bitmap, 
@@ -306,9 +326,13 @@ DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect,
     XP_Bool isPending = (flags & CELL_HIGHLIGHT) != 0;
     XP_Bool isFocussed = (flags & CELL_ISCURSOR) != 0;
     XP_Bool isDragSrc = (flags & CELL_DRAGSRC) != 0;
+    HFONT oldFont;
 
     XP_ASSERT( !!hdc );
 
+    oldFont = SelectObject( hdc, ceGetSizedFont( dctx, xprect->height,
+                                                 RFONTS_CELL) );
+
     XPRtoRECT( &rt, xprect );
     ++rt.bottom;
     ++rt.right;
@@ -389,6 +413,8 @@ DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect,
 
     ceDrawHintBorders( hdc, xprect, hintAtts );
 
+    SelectObject( hdc, oldFont );
+
     return XP_TRUE;
 } /* ce_draw_drawCell */
 
@@ -476,12 +502,15 @@ drawDrawTileGuts( DrawCtx* p_dctx, const XP_Rect* xprect,
         FillRect( hdc, &rt, dctx->brushes[backIndex] );
 
         if ( !isEmpty ) {
+            XP_U16 thirdHt = xprect->height / 3;
             if ( !highlighted ) {
                 InsetRect( &rt, 1, 1 );
             }
 
             if ( !!letters ) {
-                HFONT oldFont = SelectObject( hdc, dctx->trayFont );
+                HFONT font = ceGetSizedFont( dctx, thirdHt*2, 
+                                             RFONTS_TRAY );
+                HFONT oldFont = SelectObject( hdc, font );
                 MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, letters, -1,
                                      widebuf, 
                                      VSIZE(widebuf) );
@@ -499,9 +528,13 @@ drawDrawTileGuts( DrawCtx* p_dctx, const XP_Rect* xprect,
             }
 
             if ( val >= 0 ) {
+                HFONT font = ceGetSizedFont( dctx, thirdHt, 
+                                             RFONTS_TRAYVAL );
+                HFONT oldFont = SelectObject( hdc, font );
                 swprintf( widebuf, L"%d", val );
                 DrawText(hdc, widebuf, -1, &rt, 
                          DT_SINGLELINE | DT_BOTTOM | DT_RIGHT);	
+                SelectObject( hdc, oldFont );
             }
         }
     }
@@ -991,9 +1024,13 @@ DRAW_FUNC_NAME(destroyCtxt)( DrawCtx* p_dctx )
         DeleteObject( dctx->brushes[i] );
     }
 
-    DeleteObject( dctx->trayFont );
     DeleteObject( dctx->playerFont );
     DeleteObject( dctx->selPlayerFont );
+    for ( i = 0; i < N_RESIZE_FONTS; ++i ) {
+        if ( !!dctx->setFont[i] ) {
+            DeleteObject( dctx->setFont[i] );
+        }
+    }
 
     DeleteObject( dctx->rightArrow );
     DeleteObject( dctx->downArrow );
@@ -1061,10 +1098,7 @@ ceFontsSetup( CEDrawCtx* dctx )
     LOGFONT font;
 
     XP_MEMSET( &font, 0, sizeof(font) );
-    font.lfHeight = (CE_TRAY_SCALEV*2)/3;
-    font.lfWeight = 600;     /* FW_DEMIBOLD */
     wcscpy( font.lfFaceName, L"Arial" );
-    dctx->trayFont = CreateFontIndirect( &font );
 
     font.lfWeight = FW_LIGHT;
     font.lfHeight = CE_SCORE_HEIGHT - 2;
@@ -1073,7 +1107,6 @@ ceFontsSetup( CEDrawCtx* dctx )
     font.lfWeight = FW_BOLD;
     font.lfHeight = CE_SCORE_HEIGHT;
     dctx->selPlayerFont = CreateFontIndirect( &font );
-
 } /* ceFontsSetup */
 
 void
diff --git a/wince/cemain.h b/wince/cemain.h
index efa767cdc..2e1eb240b 100755
--- a/wince/cemain.h
+++ b/wince/cemain.h
@@ -168,6 +168,14 @@ enum {
 
 #define CE_NUM_EDITABLE_COLORS CE_BLACK_COLOR
 
+typedef enum { 
+    RFONTS_TRAY
+    ,RFONTS_TRAYVAL
+    ,RFONTS_CELL
+
+    ,N_RESIZE_FONTS
+} RFIndex;
+
 typedef struct CEDrawCtx {
     DrawCtxVTable* vtable;
     
@@ -178,9 +186,10 @@ typedef struct CEDrawCtx {
 
     HBRUSH brushes[CE_NUM_COLORS];
 
-    HFONT trayFont;
     HFONT selPlayerFont;
     HFONT playerFont;
+    HFONT setFont[N_RESIZE_FONTS];
+    XP_U16 setFontHt[N_RESIZE_FONTS];
 
     HBITMAP rightArrow;
     HBITMAP downArrow;
diff --git a/wince/xwords4.rc b/wince/xwords4.rc
index b84f9081a..4253990f0 100755
--- a/wince/xwords4.rc
+++ b/wince/xwords4.rc
@@ -81,7 +81,6 @@ BEGIN
         MENUITEM "Flip",                       ID_MOVE_FLIP
         MENUITEM "Trade",                      ID_MOVE_TRADE
         MENUITEM "(un)Hide tray",              ID_MOVE_HIDETRAY
-        MENUITEM "Tile values",                ID_MOVE_VALUES
 
         POPUP "Undo"
         BEGIN
@@ -96,6 +95,8 @@ BEGIN
 #ifdef XWFEATURE_SEARCHLIMIT
             MENUITEM "Limited hint",           ID_MOVE_LIMITEDHINT
 #endif
+            MENUITEM SEPARATOR
+            MENUITEM "Tile values",            ID_MOVE_VALUES
         END
 
         POPUP "Game"