mirror of
https://github.com/Rockbox/rockbox.git
synced 2026-05-12 19:53:18 -04:00
plugins: imageviewer: use theme in all submenus
Affects submenus "Toggle Slideshow Mode" and "Slideshow Time" that were left un-themed. Also prevents theme from being re-toggled when entering "Display Options" submenu. Change-Id: I3995d5eb12bbc8fb868c179db8043576eb675dbc
This commit is contained in:
parent
6dc731dff2
commit
2690418551
1 changed files with 14 additions and 7 deletions
|
|
@ -361,12 +361,6 @@ static int show_menu(void) /* return 1 to quit */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if LCD_DEPTH > 1
|
|
||||||
rb->lcd_set_backdrop(NULL);
|
|
||||||
rb->lcd_set_foreground(LCD_WHITE);
|
|
||||||
rb->lcd_set_background(LCD_BLACK);
|
|
||||||
#endif
|
|
||||||
rb->lcd_clear_display();
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -776,9 +770,22 @@ static int scroll_bmp(struct image_info *info, bool initial_frame)
|
||||||
#ifdef USEGSLIB
|
#ifdef USEGSLIB
|
||||||
grey_show(false); /* switch off greyscale overlay */
|
grey_show(false); /* switch off greyscale overlay */
|
||||||
#endif
|
#endif
|
||||||
if (show_menu() == 1)
|
FOR_NB_SCREENS(i)
|
||||||
|
rb->viewportmanager_theme_enable(i, true, NULL);
|
||||||
|
int ret = show_menu();
|
||||||
|
FOR_NB_SCREENS(i)
|
||||||
|
rb->viewportmanager_theme_undo(i, false);
|
||||||
|
|
||||||
|
if (ret == 1)
|
||||||
return PLUGIN_OK;
|
return PLUGIN_OK;
|
||||||
|
|
||||||
|
#if LCD_DEPTH > 1
|
||||||
|
rb->lcd_set_backdrop(NULL);
|
||||||
|
rb->lcd_set_foreground(LCD_WHITE);
|
||||||
|
rb->lcd_set_background(LCD_BLACK);
|
||||||
|
#endif
|
||||||
|
rb->lcd_clear_display();
|
||||||
|
|
||||||
#ifdef USEGSLIB
|
#ifdef USEGSLIB
|
||||||
grey_show(true); /* switch on greyscale overlay */
|
grey_show(true); /* switch on greyscale overlay */
|
||||||
#else
|
#else
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue