mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-18 22:26:30 +01:00
swap focus-related event data, and include the UI color table call used to
determine the color of self-drawn focus elements. I can't draw the nav ring on ARM, but otherwise five-way nav works on arm with this checkin.
This commit is contained in:
parent
bb45f89a6f
commit
424718b5bb
2 changed files with 23 additions and 0 deletions
|
@ -226,3 +226,8 @@ BmpDelete
|
|||
WinCreateBitmapWindow
|
||||
WinSetDrawMode
|
||||
WinGetPixel
|
||||
#
|
||||
# Needed for five-way navigation
|
||||
#
|
||||
UIColorGetTableEntryIndex
|
||||
#HsNavDrawFocusRing
|
||||
|
|
|
@ -256,6 +256,15 @@ evt68k2evtARM( EventType* event, const unsigned char* evt68k )
|
|||
event->data.ctlSelect.value = read_unaligned16(evt68k+8);
|
||||
break;
|
||||
|
||||
#ifdef XWFEATURE_FIVEWAY
|
||||
case frmObjectFocusTakeEvent:
|
||||
case frmObjectFocusLostEvent:
|
||||
event->data.frmObjectFocusTake.formID = read_unaligned16(evt68k);
|
||||
event->data.frmObjectFocusTake.objectID = read_unaligned16(evt68k+2);
|
||||
event->data.frmObjectFocusTake.dispatchHint = read_unaligned32(evt68k+4);
|
||||
break;
|
||||
#endif
|
||||
|
||||
case winExitEvent:
|
||||
case winEnterEvent:
|
||||
XP_ASSERT( &event->data.winEnter.enterWindow ==
|
||||
|
@ -341,6 +350,15 @@ evtArm2evt68K( unsigned char* evt68k, const EventType* event )
|
|||
write_unaligned16( evt68k+8, event->data.ctlSelect.value );
|
||||
break;
|
||||
|
||||
#ifdef XWFEATURE_FIVEWAY
|
||||
case frmObjectFocusTakeEvent:
|
||||
case frmObjectFocusLostEvent:
|
||||
write_unaligned16( evt68k, event->data.frmObjectFocusTake.formID );
|
||||
write_unaligned16( evt68k+2, event->data.frmObjectFocusTake.objectID );
|
||||
write_unaligned32( evt68k+4, event->data.frmObjectFocusTake.dispatchHint );
|
||||
break;
|
||||
#endif
|
||||
|
||||
case winExitEvent:
|
||||
case winEnterEvent:
|
||||
XP_ASSERT( &event->data.winEnter.enterWindow ==
|
||||
|
|
Loading…
Reference in a new issue