Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use SHInitDialog on smartphone to create fullscreen dialogs. Move

Browse source 
test for smartphone into util functions so can't forget it.  This
fixes scrolling on smartphone.
This commit is contained in:
ehouse 2008-05-10 15:42:52 +00:00
parent ebad668227
commit e178b7ccf5
7 changed files with 96 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xwords4/wince/ceclrsel.c
View file

@ -181,9 +181,7 @@ EditColorsDlg( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
switch (message) {
case WM_VSCROLL:
if ( !IS_SMARTPHONE(eState->globals) ) {
ceDoDlgScroll( hDlg, wParam );
}
ceDoDlgScroll( eState->globals, hDlg, wParam );
break;
case WM_PAINT: {
@ -424,13 +422,11 @@ ColorsDlg( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
switch (message) {
case WM_VSCROLL:
if ( !IS_SMARTPHONE(state->globals) ) {
ceDoDlgScroll( hDlg, wParam );
}
ceDoDlgScroll( state->globals, hDlg, wParam );
break;
case WM_DRAWITEM: /* passed when button has BS_OWNERDRAW style */
ceDoDlgFocusScroll( hDlg,
ceDoDlgFocusScroll( state->globals, hDlg,
/* Fake out ceDoDlgFocusScroll, passing ctrl itself */
(WPARAM)((DRAWITEMSTRUCT*)lParam)->hwndItem,
(LPARAM)TRUE );

9
xwords4/wince/ceginfo.c
View file

@ -523,17 +523,12 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
switch (message) {
case WM_VSCROLL:
if ( !IS_SMARTPHONE(globals) ) {
ceDoDlgScroll( hDlg, wParam );
result = TRUE;
}
result = ceDoDlgScroll( globals, hDlg, wParam );
break;
/* WM_NEXTDLGCTL is worthless; prev obj still has focus */
case WM_NEXTDLGCTL:
if ( !IS_SMARTPHONE(globals) ) {
ceDoDlgFocusScroll( hDlg, wParam, lParam );
}
ceDoDlgFocusScroll( globals, hDlg, wParam, lParam );
break;
#ifdef OWNERDRAW_JUGGLE

8
xwords4/wince/ceprefs.c
View file

@ -272,15 +272,11 @@ PrefsDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
switch (message) {
case WM_VSCROLL:
if ( !IS_SMARTPHONE(globals) ) {
ceDoDlgScroll( hDlg, wParam );
}
ceDoDlgScroll( globals, hDlg, wParam );
break;
case WM_NEXTDLGCTL:
if ( !IS_SMARTPHONE(globals) ) {
ceDoDlgFocusScroll( hDlg, wParam, lParam );
}
ceDoDlgFocusScroll( globals, hDlg, wParam, lParam );
break;
case WM_COMMAND:

4
xwords4/wince/cestrbx.c
View file

@ -90,9 +90,7 @@ StrBox(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
switch (message) {
case WM_VSCROLL:
if ( !IS_SMARTPHONE(globals) ) {
ceDoDlgScroll( hDlg, wParam );
}
ceDoDlgScroll( globals, hDlg, wParam );
break;
case WM_COMMAND:

8
xwords4/wince/cesvdgms.c
View file

@ -284,15 +284,11 @@ SavedGamesDlg( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
switch (message) {
case WM_VSCROLL:
if ( !IS_SMARTPHONE(state->globals) ) {
ceDoDlgScroll( hDlg, wParam );
}
ceDoDlgScroll( state->globals, hDlg, wParam );
break;
case WM_NEXTDLGCTL:
if ( !IS_SMARTPHONE(state->globals) ) {
ceDoDlgFocusScroll( hDlg, wParam, lParam );
}
ceDoDlgFocusScroll( state->globals, hDlg, wParam, lParam );
break;
case WM_COMMAND:

145
xwords4/wince/ceutil.c
View file

@ -294,22 +294,37 @@ static XP_Bool
mkFullscreenWithSoftkeys( CEAppGlobals* globals, HWND hDlg )
{
XP_Bool success = XP_FALSE;
SHMENUBARINFO mbi;
XP_Bool fullScreen = XP_TRUE; /* probably want this TRUE for
small-screened smartphones only. */
if ( fullScreen ) {
if ( IS_SMARTPHONE(globals) ) {
SHINITDLGINFO info;
XP_MEMSET( &info, 0, sizeof(info) );
info.dwMask = SHIDIM_FLAGS;
info.dwFlags = SHIDIF_SIZEDLGFULLSCREEN;
info.hDlg = hDlg;
success = SHInitDialog( &info );
if ( !success ) {
XP_LOGF( "SHInitDialog failed: %ld", GetLastError() );
}
} else if ( fullScreen ) {
ceSizeIfFullscreen( globals, hDlg );
success = XP_TRUE;
}
XP_MEMSET( &mbi, 0, sizeof(mbi) );
mbi.cbSize = sizeof(mbi);
mbi.hwndParent = hDlg;
mbi.nToolBarId = IDM_OKCANCEL_MENUBAR;
mbi.hInstRes = globals->hInst;
success = SHCreateMenuBar( &mbi );
if ( !success ) {
XP_LOGF( "SHCreateMenuBar failed: %ld", GetLastError() );
if ( success ) {
SHMENUBARINFO mbi;
XP_MEMSET( &mbi, 0, sizeof(mbi) );
mbi.cbSize = sizeof(mbi);
mbi.hwndParent = hDlg;
mbi.nToolBarId = IDM_OKCANCEL_MENUBAR;
mbi.hInstRes = globals->hInst;
success = SHCreateMenuBar( &mbi );
if ( !success ) {
XP_LOGF( "SHCreateMenuBar failed: %ld", GetLastError() );
}
}
return success;
} /* mkFullscreenWithSoftkeys */
#endif
@ -414,36 +429,40 @@ adjustScrollPos( HWND hDlg, XP_S16 vertChange )
LOG_RETURN_VOID();
} /* adjustScrollPos */
void
ceDoDlgScroll( HWND hDlg, WPARAM wParam )
XP_Bool
ceDoDlgScroll( CEAppGlobals* globals, HWND hDlg, WPARAM wParam )
{
XP_S16 vertChange = 0;
XP_Bool handled = !IS_SMARTPHONE(globals);
if ( handled ) {
XP_S16 vertChange = 0;
switch ( LOWORD(wParam) ) {
switch ( LOWORD(wParam) ) {
case SB_LINEUP: // Scrolls one line up
vertChange = -1;
break;
case SB_PAGEUP: //
vertChange = -10;
break;
case SB_LINEUP: // Scrolls one line up
vertChange = -1;
break;
case SB_PAGEUP: //
vertChange = -10;
break;
case SB_LINEDOWN: // Scrolls one line down
vertChange = 1;
break;
case SB_PAGEDOWN: // Scrolls one page down
vertChange = 10;
break;
case SB_LINEDOWN: // Scrolls one line down
vertChange = 1;
break;
case SB_PAGEDOWN: // Scrolls one page down
vertChange = 10;
break;
case SB_THUMBTRACK: /* still dragging; don't redraw */
case SB_THUMBPOSITION:
setScrollPos( hDlg, HIWORD(wParam) );
break;
}
if ( 0 != vertChange ) {
adjustScrollPos( hDlg, vertChange );
case SB_THUMBTRACK: /* still dragging; don't redraw */
case SB_THUMBPOSITION:
setScrollPos( hDlg, HIWORD(wParam) );
break;
}
if ( 0 != vertChange ) {
adjustScrollPos( hDlg, vertChange );
}
}
return handled;
} /* ceDoDlgScroll */
@ -462,7 +481,7 @@ ceDoDlgScroll( HWND hDlg, WPARAM wParam )
style receives the focus. */
void
ceDoDlgFocusScroll( HWND hDlg, WPARAM wParam, LPARAM lParam )
ceDoDlgFocusScroll( CEAppGlobals* globals, HWND hDlg, WPARAM wParam, LPARAM lParam )
{
/* Scroll the current focus owner into view.
*
@ -480,39 +499,41 @@ ceDoDlgFocusScroll( HWND hDlg, WPARAM wParam, LPARAM lParam )
* scrolling to see how to fix it.
*/
HWND nextCtrl;
if ( LOWORD(lParam) ) {
nextCtrl = (HWND)wParam;
} else {
BOOL previous = wParam != 0;
nextCtrl = GetNextDlgTabItem( hDlg, GetFocus(), previous );
}
if ( !IS_SMARTPHONE(globals) ) {
HWND nextCtrl;
if ( LOWORD(lParam) ) {
nextCtrl = (HWND)wParam;
} else {
BOOL previous = wParam != 0;
nextCtrl = GetNextDlgTabItem( hDlg, GetFocus(), previous );
}
if ( !!nextCtrl ) {
RECT rect;
XP_U16 dlgHeight, ctrlHeight, dlgTop;
XP_S16 ctrlPos;
if ( !!nextCtrl ) {
RECT rect;
XP_U16 dlgHeight, ctrlHeight, dlgTop;
XP_S16 ctrlPos;
GetClientRect( hDlg, &rect );
dlgHeight = rect.bottom - rect.top;
XP_LOGF( "dlgHeight: %d", dlgHeight );
GetClientRect( hDlg, &rect );
dlgHeight = rect.bottom - rect.top;
XP_LOGF( "dlgHeight: %d", dlgHeight );
GetWindowRect( hDlg, &rect );
dlgTop = rect.top;
GetWindowRect( hDlg, &rect );
dlgTop = rect.top;
GetWindowRect( nextCtrl, &rect );
ctrlPos = rect.top - dlgTop - TITLE_HT;
ctrlHeight = rect.bottom - rect.top;
GetWindowRect( nextCtrl, &rect );
ctrlPos = rect.top - dlgTop - TITLE_HT;
ctrlHeight = rect.bottom - rect.top;
XP_LOGF( "%p: ctrlPos is %d; height is %d",
nextCtrl, ctrlPos, ctrlHeight );
XP_LOGF( "%p: ctrlPos is %d; height is %d",
nextCtrl, ctrlPos, ctrlHeight );
if ( ctrlPos < 0 ) {
XP_LOGF( "need to scroll it DOWN into view" );
adjustScrollPos( hDlg, ctrlPos );
} else if ( (ctrlPos + ctrlHeight) > dlgHeight ) {
XP_LOGF( "need to scroll it UP into view" );
setScrollPos( hDlg, ctrlPos - ctrlHeight );
if ( ctrlPos < 0 ) {
XP_LOGF( "need to scroll it DOWN into view" );
adjustScrollPos( hDlg, ctrlPos );
} else if ( (ctrlPos + ctrlHeight) > dlgHeight ) {
XP_LOGF( "need to scroll it UP into view" );
setScrollPos( hDlg, ctrlPos - ctrlHeight );
}
}
}
} /* ceDoDlgFocusScroll */

5
xwords4/wince/ceutil.h
View file

@ -50,8 +50,9 @@ void ceDlgSetup( CEAppGlobals* globals, HWND hDlg );
XP_Bool ceIsLandscape( CEAppGlobals* globals );
void ceSetLeftSoftkey( CEAppGlobals* globals, XP_U16 id );
void ceDoDlgScroll( HWND hDlg, WPARAM wParam );
void ceDoDlgFocusScroll( HWND hDlg, WPARAM wParam, LPARAM lParam );
XP_Bool ceDoDlgScroll( CEAppGlobals* globals, HWND hDlg, WPARAM wParam );
void ceDoDlgFocusScroll( CEAppGlobals* globals, HWND hDlg,
WPARAM wParam, LPARAM lParam );
#ifdef _WIN32_WCE
void ceSizeIfFullscreen( CEAppGlobals* globals, HWND hWnd );
#else