Skip to content

Commit 5bb35d4

Browse files
committed
fix display bug
Signed-off-by: Michel-FK <[email protected]>
1 parent adbebb0 commit 5bb35d4

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

menu.cpp

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ void Menu::add_menu_zone(ENUM_MENU_TYPE menu_type)
365365
case MENU_TYPE_EXIT:
366366
MENU_DEBUG_PRINTF("Init MENU_TYPE_EXIT\n");
367367
/// ------ Text ------
368-
text_surface = TTF_RenderText_Blended(menu_title_font, "EXIT", text_color);
368+
text_surface = TTF_RenderText_Blended(menu_title_font, "EXIT APP", text_color);
369369
text_pos.x = (surface->w - MENU_ZONE_WIDTH)/2 + (MENU_ZONE_WIDTH - text_surface->w)/2;
370370
text_pos.y = surface->h - MENU_ZONE_HEIGHT/2 - text_surface->h/2;
371371
SDL_BlitSurface(text_surface, NULL, surface, &text_pos);
@@ -415,16 +415,6 @@ void Menu::add_menu_zone(ENUM_MENU_TYPE menu_type)
415415
text_pos.y = surface->h - MENU_ZONE_HEIGHT/2 - text_surface->h/2;
416416
SDL_BlitSurface(text_surface, NULL, surface, &text_pos);
417417
break;
418-
#endif
419-
#ifdef HAS_MENU_RO_RW
420-
case MENU_TYPE_RO_RW:
421-
MENU_DEBUG_PRINTF("Init MENU_TYPE_RO_RW\n");
422-
/// ------ Text ------
423-
text_surface = TTF_RenderText_Blended(menu_title_font, "SYSTEM RO", text_color);
424-
text_pos.x = (surface->w - MENU_ZONE_WIDTH)/2 + (MENU_ZONE_WIDTH - text_surface->w)/2;
425-
text_pos.y = surface->h - MENU_ZONE_HEIGHT/2 - text_surface->h/2;
426-
SDL_BlitSurface(text_surface, NULL, surface, &text_pos);
427-
break;
428418
#endif
429419
default:
430420
MENU_DEBUG_PRINTF("Warning - In add_menu_zone, unknown MENU_TYPE: %d\n", menu_type);
@@ -786,7 +776,7 @@ void Menu::menu_screen_refresh(int menuItem, int prevItem, int scroll, uint8_t m
786776
#endif
787777
#ifdef HAS_MENU_RO_RW
788778
case MENU_TYPE_RO_RW:
789-
sprintf(text_tmp, "SYSTEM %s", read_write?"RO":"RW");
779+
sprintf(text_tmp, "SYS %s", read_write?"READ-ONLY":"READ-WRITE");
790780
text_surface = TTF_RenderText_Blended(menu_title_font, text_tmp, text_color);
791781
text_pos.x = (virtual_hw_screen->w - MENU_ZONE_WIDTH)/2 + (MENU_ZONE_WIDTH - text_surface->w)/2;
792782
text_pos.y = virtual_hw_screen->h - MENU_ZONE_HEIGHT/2 - text_surface->h/2;
@@ -1364,5 +1354,13 @@ int Menu::run(void)
13641354
if(SDL_EnableKeyRepeat(backup_key_repeat_delay, backup_key_repeat_interval)){
13651355
MENU_ERROR_PRINTF("ERROR with SDL_EnableKeyRepeat: %s\n", SDL_GetError());
13661356
}
1357+
1358+
/// --------- Clear HW screen ----------
1359+
if(SDL_BlitSurface(backup_hw_screen, NULL, virtual_hw_screen, NULL)){
1360+
MENU_ERROR_PRINTF("ERROR Could not Clear virtual_hw_screen: %s\n", SDL_GetError());
1361+
}
1362+
1363+
/// --------- Flip Screen ----------
1364+
SDL_Flip(virtual_hw_screen);
13671365
return returnCode;
13681366
}

0 commit comments

Comments
 (0)