gwh/saturnng
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

display letters again for 48sx

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-10-13 19:46:34 +02:00
parent 442a455652
commit 0c3f575025
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
3 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/modules.c
View file

@ -972,10 +972,9 @@ void ModInit( void )
/* Reset all modules */
ModReset();
} else {
} else
/* Rebuild page table (not saved on disk) */
RebuildPageTable( 0, N_PAGE_TABLE_ENTRIES - 1 );
}
}
/* .+

3
src/ui4x/ncurses.c
View file

@ -456,9 +456,6 @@ void ui_stop_ncurses( void )
void ui_start_ncurses( config_t* conf )
{
if ( config.verbose )
fprintf( stderr, "UI is ncurses\n" );
config = *conf;
setlocale( LC_ALL, "" );

14
src/ui4x/sdl2.c
View file

@ -714,16 +714,11 @@ static void _draw_keypad( void )
// Letter (small character bottom right of key)
if ( BUTTONS[ i ].letter != ( char* )0 ) {
x = OFFSET_X_KEYBOARD + BUTTONS[ i ].x + BUTTONS[ i ].w;
y = OFFSET_Y_KEYBOARD + BUTTONS[ i ].y + BUTTONS[ i ].h;
x = OFFSET_X_KEYBOARD + BUTTONS[ i ].x + BUTTONS[ i ].w + 3;
y = OFFSET_Y_KEYBOARD + BUTTONS[ i ].y + BUTTONS[ i ].h + 1;
if ( config.model == MODEL_48SX ) {
x -= SmallTextWidth( BUTTONS[ i ].letter, 1 ) / 2 + 5;
if ( config.model == MODEL_48SX )
y -= 2;
} else {
x += 3;
y += 1;
}
write_with_small_font( x, y, BUTTONS[ i ].letter, UI4X_COLOR_ALPHA,
( ( config.model == MODEL_48GX || config.model == MODEL_48SX ) && i < HP48_KEY_MTH )
@ -1073,9 +1068,6 @@ void ui_update_display_sdl( void )
void ui_start_sdl( config_t* conf )
{
if ( config.verbose )
fprintf( stderr, "UI is sdl2\n" );
config = *conf;
ui_init_LCD();