From fde2ef1ee28a1e9ef9a5932b31013db493689483 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sat, 27 May 2006 22:52:10 +0000
Subject: [PATCH] Before putting dialog into landscape mode, make sure it won't
 be wider than the screen.  That is, don't be fooled when in portrait mode by
 a screen height that's SIP-reduced.

---
 xwords4/wince/ceutil.c | 48 +++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/xwords4/wince/ceutil.c b/xwords4/wince/ceutil.c
index d4c672158..b6e9dfab1 100755
--- a/xwords4/wince/ceutil.c
+++ b/xwords4/wince/ceutil.c
@@ -249,10 +249,11 @@ ceStackButtonsRight( CEAppGlobals* globals, HWND hDlg )
 
     if ( ceIsLandscape( globals ) ) {
         XP_U16 resIDs[] = { IDOK, IDCANCEL };
-        RECT rect;
+        RECT wrect, crect;
         XP_U16 left, top;
         XP_U16 butWidth, butHeight;
         XP_U16 barHt, i, nButtons, spacing;
+        XP_U16 newWidth;
 
         /* First, figure height and width to use */
         butHeight = 0;
@@ -274,33 +275,36 @@ ceStackButtonsRight( CEAppGlobals* globals, HWND hDlg )
             }
         }
 
-        GetWindowRect( hDlg, &rect ); 
-        barHt = rect.bottom - rect.top;
+        /* Make sure we're not proposing to make the dialog wider than the
+           screen */
+        GetClientRect( hDlg, &crect );
+        newWidth = crect.right - crect.left + butWidth + (HPADDING*2);
+        GetWindowRect( globals->hWnd, &wrect );
+        if ( newWidth <= wrect.right - wrect.left ) {
 
-        GetClientRect( hDlg, &rect );
-        barHt -= rect.bottom;
+            GetWindowRect( hDlg, &wrect ); 
+            barHt = wrect.bottom - wrect.top - crect.bottom;
 
-        spacing = rect.bottom - (nButtons * (butHeight + (VPADDING*2)));
-        spacing /= nButtons + 1;
+            spacing = crect.bottom - (nButtons * (butHeight + (VPADDING*2)));
+            spacing /= nButtons + 1;
 
-        top = spacing - (butHeight / 2) + VPADDING;
-        left = rect.right + HPADDING;
+            top = spacing - (butHeight / 2) + VPADDING;
+            left = crect.right + HPADDING;
 
-        for ( i = 0; i < sizeof(resIDs)/sizeof(resIDs[0]); ++i ) {
-            HWND itemH = GetDlgItem( hDlg, resIDs[i] );
-            if ( ceIsVisible( itemH ) ) { 
-                (void)MoveWindow( itemH, left, top, butWidth, butHeight, TRUE );
-                top += butHeight + spacing + (VPADDING * 2);
+            for ( i = 0; i < sizeof(resIDs)/sizeof(resIDs[0]); ++i ) {
+                HWND itemH = GetDlgItem( hDlg, resIDs[i] );
+                if ( ceIsVisible( itemH ) ) { 
+                    (void)MoveWindow( itemH, left, top, butWidth, butHeight, 
+                                      TRUE );
+                    top += butHeight + spacing + (VPADDING * 2);
+                }
             }
+
+            butWidth += HPADDING*2;
+            MoveWindow( hDlg, wrect.left - (butWidth/2), wrect.top,
+                        newWidth, wrect.bottom - wrect.top - butHeight - 2, 
+                        FALSE );
         }
-
-        butWidth += HPADDING*2;
-        GetWindowRect( hDlg, &rect );
-
-        MoveWindow( hDlg, rect.left - (butWidth/2), rect.top,
-                    rect.right - rect.left + butWidth,
-                    rect.bottom - rect.top - butHeight - 2, 
-                    FALSE );
     }
 } /* ceStackButtonsRight */