don't scroll when menu's frontmost

This commit is contained in:
ehouse 2004-11-13 16:01:30 +00:00
parent 4dd83e59dd
commit fbb08f7d84
2 changed files with 21 additions and 19 deletions

View file

@ -209,3 +209,4 @@ FtrPtrFree
SysUIAppSwitch SysUIAppSwitch
FntBaseLine FntBaseLine
WinSetScalingMode WinSetScalingMode
WinGetDrawWindow

View file

@ -2714,6 +2714,8 @@ handleScrollInAsk( EventPtr event )
FieldPtr field; FieldPtr field;
UInt16 endPosition; UInt16 endPosition;
XP_ASSERT ( !!globals );
field = getActiveObjectPtr( XW_ASK_TXT_FIELD_ID ); field = getActiveObjectPtr( XW_ASK_TXT_FIELD_ID );
switch ( event->eType ) { switch ( event->eType ) {
@ -2727,6 +2729,8 @@ handleScrollInAsk( EventPtr event )
break; break;
case keyDownEvent: case keyDownEvent:
/* don't scroll a menu if open! */
if ( FrmGetWindowHandle( FrmGetActiveForm() ) == WinGetDrawWindow() ) {
switch ( event->data.keyDown.chr ) { switch ( event->data.keyDown.chr ) {
case pageUpChr: case pageUpChr:
case vchrRockerUp: case vchrRockerUp:
@ -2741,6 +2745,7 @@ handleScrollInAsk( EventPtr event )
} }
linesToScroll = 3; linesToScroll = 3;
scrollFromButton = true; scrollFromButton = true;
}
break; break;
case sclRepeatEvent: { case sclRepeatEvent: {
@ -2860,12 +2865,8 @@ palmask( PalmAppGlobals* globals, XP_UCHAR* str, XP_UCHAR* yesButton,
centerControl( form, XW_ASK_YES_BUTTON_ID ); centerControl( form, XW_ASK_YES_BUTTON_ID );
} }
/* if we're running before the first form goes up, globals won't be
available via the refcon, so don't install handler than requires 'em.
That or move globals to a Ftr.... */
if ( !!prevForm ) {
FrmSetEventHandler( form, handleScrollInAsk ); FrmSetEventHandler( form, handleScrollInAsk );
}
globals->prevScroll = 0; globals->prevScroll = 0;
if ( globals->isLefty ) { if ( globals->isLefty ) {