From f7de2b096ae25f520e7b222208ce3c2128a12cdf Mon Sep 17 00:00:00 2001 From: ehouse Date: Sat, 5 Feb 2005 21:49:03 +0000 Subject: [PATCH] shrink a couple of dialogs to fit square screen --- xwords4/wince/xwords4.rc | 71 ++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/xwords4/wince/xwords4.rc b/xwords4/wince/xwords4.rc index 54fe79831..cb06b42b1 100755 --- a/xwords4/wince/xwords4.rc +++ b/xwords4/wince/xwords4.rc @@ -149,7 +149,15 @@ BEGIN IDC_STATIC,32,10,86,89,SS_NOPREFIX END -#define ROW_SPACE 15 +#ifdef CEFEATURE_CANSCROLL +# define ROW_HEIGHT 10 +# define ROW_SPACE 12 +# define ROW_SPACE_PL 11 +#else +# define ROW_HEIGHT 12 +# define ROW_SPACE 15 +# define ROW_SPACE_PL ROW_SPACE +#endif #define LEFT_COL 2 #ifdef XWFEATURE_STANDALONE_ONLY # define GAME_NAME_LEFT LEFT_COL @@ -169,13 +177,14 @@ END #define LABELS_ROW (NPLAYERS_ROW+ROW_SPACE) -#define PLAYER_ROW_1 (LABELS_ROW+ROW_SPACE-5) -#define PLAYER_ROW_2 (PLAYER_ROW_1+ROW_SPACE) -#define PLAYER_ROW_3 (PLAYER_ROW_2+ROW_SPACE) -#define PLAYER_ROW_4 (PLAYER_ROW_3+ROW_SPACE) +#define PLAYER_ROW_1 (LABELS_ROW+ROW_SPACE) +#define PLAYER_ROW_2 (PLAYER_ROW_1+ROW_SPACE_PL) +#define PLAYER_ROW_3 (PLAYER_ROW_2+ROW_SPACE_PL) +#define PLAYER_ROW_4 (PLAYER_ROW_3+ROW_SPACE_PL) #define DICTPICK_ROW (PLAYER_ROW_4+ROW_SPACE) #define BUTTONS_ROW (DICTPICK_ROW+ROW_SPACE+3) -#define GAMEINFO_HEIGHT (BUTTONS_ROW+ROW_SPACE+2) +#define BUTTON_HT 12 +#define GAMEINFO_HEIGHT (BUTTONS_ROW + BUTTON_HT + 4) IDD_GAMEINFO DIALOG DISCARDABLE 0, 0, 133, GAMEINFO_HEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER @@ -200,53 +209,57 @@ BEGIN LTEXT "Pwd",IDC_STATIC,109,LABELS_ROW,16,8 #ifndef XWFEATURE_STANDALONE_ONLY CONTROL "",REMOTE_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - GAME_REMOTE_LEFT, PLAYER_ROW_1,16,12 + GAME_REMOTE_LEFT, PLAYER_ROW_1,16,ROW_HEIGHT CONTROL "",REMOTE_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - GAME_REMOTE_LEFT, PLAYER_ROW_2,16,12 + GAME_REMOTE_LEFT, PLAYER_ROW_2,16,ROW_HEIGHT CONTROL "",REMOTE_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - GAME_REMOTE_LEFT, PLAYER_ROW_3,16,12 + GAME_REMOTE_LEFT, PLAYER_ROW_3,16,ROW_HEIGHT CONTROL "",REMOTE_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - GAME_REMOTE_LEFT, PLAYER_ROW_4,16,12 + GAME_REMOTE_LEFT, PLAYER_ROW_4,16,ROW_HEIGHT #endif CONTROL "",ROBOT_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - GAME_ROBOT_LEFT,PLAYER_ROW_1,16,12 + GAME_ROBOT_LEFT,PLAYER_ROW_1,16,ROW_HEIGHT CONTROL "",ROBOT_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - GAME_ROBOT_LEFT,PLAYER_ROW_2,16,12 + GAME_ROBOT_LEFT,PLAYER_ROW_2,16,ROW_HEIGHT CONTROL "",ROBOT_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - GAME_ROBOT_LEFT,PLAYER_ROW_3,16,12 + GAME_ROBOT_LEFT,PLAYER_ROW_3,16,ROW_HEIGHT CONTROL "",ROBOT_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - GAME_ROBOT_LEFT, PLAYER_ROW_4,16,12 + GAME_ROBOT_LEFT, PLAYER_ROW_4,16,ROW_HEIGHT - EDITTEXT NAME_EDIT1,GAME_NAME_LEFT,PLAYER_ROW_1,70,12,ES_AUTOHSCROLL - EDITTEXT NAME_EDIT2,GAME_NAME_LEFT,PLAYER_ROW_2,70,12,ES_AUTOHSCROLL - EDITTEXT NAME_EDIT3,GAME_NAME_LEFT,PLAYER_ROW_3,70,12,ES_AUTOHSCROLL - EDITTEXT NAME_EDIT4,GAME_NAME_LEFT,PLAYER_ROW_4,70,12, + EDITTEXT NAME_EDIT1,GAME_NAME_LEFT,PLAYER_ROW_1,70,ROW_HEIGHT, + ES_AUTOHSCROLL + EDITTEXT NAME_EDIT2,GAME_NAME_LEFT,PLAYER_ROW_2,70,ROW_HEIGHT, + ES_AUTOHSCROLL + EDITTEXT NAME_EDIT3,GAME_NAME_LEFT,PLAYER_ROW_3,70,ROW_HEIGHT, + ES_AUTOHSCROLL + EDITTEXT NAME_EDIT4,GAME_NAME_LEFT,PLAYER_ROW_4,70,ROW_HEIGHT, ES_AUTOHSCROLL | NOT WS_VISIBLE - EDITTEXT PASS_EDIT1,GAME_PWD_LEFT,PLAYER_ROW_1,23,12, + EDITTEXT PASS_EDIT1,GAME_PWD_LEFT,PLAYER_ROW_1,23,ROW_HEIGHT, ES_PASSWORD | ES_AUTOHSCROLL - EDITTEXT PASS_EDIT2,GAME_PWD_LEFT,PLAYER_ROW_2,23,12, + EDITTEXT PASS_EDIT2,GAME_PWD_LEFT,PLAYER_ROW_2,23,ROW_HEIGHT, ES_PASSWORD | ES_AUTOHSCROLL - EDITTEXT PASS_EDIT3,GAME_PWD_LEFT,PLAYER_ROW_3,23,12, + EDITTEXT PASS_EDIT3,GAME_PWD_LEFT,PLAYER_ROW_3,23,ROW_HEIGHT, ES_PASSWORD | ES_AUTOHSCROLL - EDITTEXT PASS_EDIT4,GAME_PWD_LEFT,PLAYER_ROW_4,23,12, + EDITTEXT PASS_EDIT4,GAME_PWD_LEFT,PLAYER_ROW_4,23,ROW_HEIGHT, ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Dictionary:",IDC_STATIC,LEFT_COL,DICTPICK_ROW,36,8,SS_NOPREFIX - PUSHBUTTON "Dictionary picker",IDC_DICTBUTTON,43,DICTPICK_ROW,85,14 - DEFPUSHBUTTON "OK",IDOK,29,BUTTONS_ROW,31,14 - DEFPUSHBUTTON "Cancel",IDCANCEL,70,BUTTONS_ROW,31,14 + PUSHBUTTON "Dictionary picker",IDC_DICTBUTTON,43,DICTPICK_ROW, + 85, ROW_SPACE + DEFPUSHBUTTON "OK",IDOK,29,BUTTONS_ROW,31,BUTTON_HT + DEFPUSHBUTTON "Cancel",IDCANCEL,70,BUTTONS_ROW,31,BUTTON_HT END -IDD_STRBOX DIALOG DISCARDABLE 0, 25, 127, 132 +IDD_STRBOX DIALOG DISCARDABLE 0, 25, 127, 110 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | /*WS_SYSMENU | */ DS_CENTER CAPTION "Dialog" FONT 8, "System" BEGIN - EDITTEXT ID_EDITTEXT,6,5,115,100,ES_MULTILINE | ES_READONLY + EDITTEXT ID_EDITTEXT,6,5,115,80,ES_MULTILINE | ES_READONLY | WS_VSCROLL - DEFPUSHBUTTON "OK",IDOK,29,110,31,14 - DEFPUSHBUTTON "No",IDCANCEL,70,110,31,14 + DEFPUSHBUTTON "OK",IDOK, 29,90,31,14 + DEFPUSHBUTTON "No",IDCANCEL,70,90,31,14 END IDD_ASKBLANK DIALOG DISCARDABLE 0, 0, 131, 90