mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-13 18:17:39 -04:00
plugins: properties: keep theme enabled
Launching a themed plugin can cause the screen to flash due to the theme being disabled, before it is re-enabled right away. For the Properties plugin in particular, this seems a bit annoying and unnecessary. Change-Id: Ifa0275b453369051cc63a3c626551f54120fdb41
This commit is contained in:
parent
cb7ae38fcd
commit
2f8cab9190
2 changed files with 15 additions and 11 deletions
|
@ -856,6 +856,10 @@ int plugin_load(const char* plugin, const void* parameter)
|
|||
if (!plugin)
|
||||
return PLUGIN_ERROR;
|
||||
|
||||
/* for some plugins, the SBS can be left enabled */
|
||||
const char *sepch = strrchr(plugin, PATH_SEPCH);
|
||||
bool theme_enabled = sepch && !strcmp("properties.rock", sepch + 1);
|
||||
|
||||
if (current_plugin_handle && pfn_tsr_exit)
|
||||
{ /* if we have a resident old plugin and a callback */
|
||||
bool reenter = (strcmp(current_plugin, plugin) == 0);
|
||||
|
@ -923,7 +927,8 @@ int plugin_load(const char* plugin, const void* parameter)
|
|||
|
||||
*(p_hdr->api) = &rockbox_api;
|
||||
lcd_set_viewport(NULL);
|
||||
lcd_clear_display();
|
||||
if (!theme_enabled)
|
||||
lcd_clear_display();
|
||||
|
||||
#ifdef HAVE_REMOTE_LCD
|
||||
lcd_remote_set_viewport(NULL);
|
||||
|
@ -938,8 +943,9 @@ int plugin_load(const char* plugin, const void* parameter)
|
|||
* they should be fixed properly instead of this lock */
|
||||
tree_lock_cache(tree_get_context());
|
||||
|
||||
FOR_NB_SCREENS(i)
|
||||
viewportmanager_theme_enable(i, false, NULL);
|
||||
if (!theme_enabled)
|
||||
FOR_NB_SCREENS(i)
|
||||
viewportmanager_theme_enable(i, false, NULL);
|
||||
|
||||
#ifdef HAVE_TOUCHSCREEN
|
||||
touchscreen_set_mode(TOUCHSCREEN_BUTTON);
|
||||
|
@ -1000,13 +1006,16 @@ int plugin_load(const char* plugin, const void* parameter)
|
|||
#endif
|
||||
#endif
|
||||
|
||||
lcd_clear_display();
|
||||
#ifdef HAVE_REMOTE_LCD
|
||||
lcd_remote_clear_display();
|
||||
#endif
|
||||
|
||||
FOR_NB_SCREENS(i)
|
||||
viewportmanager_theme_undo(i, true);
|
||||
if (!theme_enabled)
|
||||
{
|
||||
lcd_clear_display();
|
||||
FOR_NB_SCREENS(i)
|
||||
viewportmanager_theme_undo(i, true);
|
||||
}
|
||||
|
||||
plugin_check_open_close__exit();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue