Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-17 18:12:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Calculate old window width correctly when figuring new width. Fixes

Browse source 
problem of buttons drawn too close to right edge.
This commit is contained in:
ehouse 2006-05-28 00:40:28 +00:00
parent fde2ef1ee2
commit 3db196156b
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
xwords4/wince/ceutil.c
View file

@ -22,7 +22,8 @@
#define BUF_SIZE 128 #define BUF_SIZE 128
#define VPADDING 4 #define VPADDING 4
#define HPADDING 2 #define HPADDING_L 2
#define HPADDING_R 3
void void
ceSetDlgItemText( HWND hDlg, XP_U16 id, const XP_UCHAR* buf ) ceSetDlgItemText( HWND hDlg, XP_U16 id, const XP_UCHAR* buf )
@ -253,7 +254,7 @@ ceStackButtonsRight( CEAppGlobals* globals, HWND hDlg )
XP_U16 left, top; XP_U16 left, top;
XP_U16 butWidth, butHeight; XP_U16 butWidth, butHeight;
XP_U16 barHt, i, nButtons, spacing; XP_U16 barHt, i, nButtons, spacing;
XP_U16 newWidth; XP_U16 newWidth, mainWidth;
/* First, figure height and width to use */ /* First, figure height and width to use */
butHeight = 0; butHeight = 0;
@ -275,21 +276,25 @@ ceStackButtonsRight( CEAppGlobals* globals, HWND hDlg )
} }
} }
GetWindowRect( globals->hWnd, &wrect );
mainWidth = wrect.right - wrect.left;
/* Make sure we're not proposing to make the dialog wider than the /* Make sure we're not proposing to make the dialog wider than the
screen */ screen */
GetClientRect( hDlg, &crect ); GetWindowRect( hDlg, &wrect );
newWidth = crect.right - crect.left + butWidth + (HPADDING*2); newWidth = wrect.right - wrect.left + butWidth
GetWindowRect( globals->hWnd, &wrect ); + HPADDING_L + HPADDING_R;
if ( newWidth <= wrect.right - wrect.left ) {
GetWindowRect( hDlg, &wrect ); if ( newWidth <= mainWidth ) {
GetClientRect( hDlg, &crect );
barHt = wrect.bottom - wrect.top - crect.bottom; barHt = wrect.bottom - wrect.top - crect.bottom;
spacing = crect.bottom - (nButtons * (butHeight + (VPADDING*2))); spacing = crect.bottom - (nButtons * (butHeight + (VPADDING*2)));
spacing /= nButtons + 1; spacing /= nButtons + 1;
top = spacing - (butHeight / 2) + VPADDING; top = spacing - (butHeight / 2) + VPADDING;
left = crect.right + HPADDING; left = crect.right + HPADDING_L;
for ( i = 0; i < sizeof(resIDs)/sizeof(resIDs[0]); ++i ) { for ( i = 0; i < sizeof(resIDs)/sizeof(resIDs[0]); ++i ) {
HWND itemH = GetDlgItem( hDlg, resIDs[i] ); HWND itemH = GetDlgItem( hDlg, resIDs[i] );
@ -300,7 +305,7 @@ ceStackButtonsRight( CEAppGlobals* globals, HWND hDlg )
} }
} }
butWidth += HPADDING*2; butWidth += HPADDING_L + HPADDING_R;
MoveWindow( hDlg, wrect.left - (butWidth/2), wrect.top, MoveWindow( hDlg, wrect.left - (butWidth/2), wrect.top,
newWidth, wrect.bottom - wrect.top - butHeight - 2, newWidth, wrect.bottom - wrect.top - butHeight - 2,
FALSE ); FALSE );