diff options
| -rw-r--r-- | gui/ThemeRenderer.cpp | 13 | ||||
| -rw-r--r-- | gui/ThemeRenderer.h | 2 | ||||
| -rw-r--r-- | gui/theme.cpp | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/gui/ThemeRenderer.cpp b/gui/ThemeRenderer.cpp index 378e32649f..2be95350e1 100644 --- a/gui/ThemeRenderer.cpp +++ b/gui/ThemeRenderer.cpp @@ -183,8 +183,8 @@ void ThemeRenderer::unloadTheme() { ImageMan.remArchive(_themeFileName + ".zip"); - _themeName.clear(); - _themeFileName.clear(); +// _themeName.clear(); +// _themeFileName.clear(); _themeOk = false; } @@ -196,6 +196,15 @@ void ThemeRenderer::clearAll() { _system->grabOverlay((OverlayColor*)_screen->pixels, _screen->w); } +void ThemeRenderer::refresh() { + init(); + if (_enabled) { + _system->showOverlay(); +// CursorMan.replaceCursorPalette(_cursorPal, 0, MAX_CURS_COLORS); +// CursorMan.replaceCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY, 255, _cursorTargetScale); + } +} + void ThemeRenderer::enable() { init(); resetDrawArea(); diff --git a/gui/ThemeRenderer.h b/gui/ThemeRenderer.h index 3c7d07b419..1fd5ea321c 100644 --- a/gui/ThemeRenderer.h +++ b/gui/ThemeRenderer.h @@ -234,7 +234,7 @@ public: void deinit(); void clearAll(); - void refresh() {} + void refresh(); void enable(); void disable(); diff --git a/gui/theme.cpp b/gui/theme.cpp index c8501c4f91..5355894c85 100644 --- a/gui/theme.cpp +++ b/gui/theme.cpp @@ -68,7 +68,7 @@ const Graphics::Font *Theme::loadFont(const char *filename) { return font; #ifdef USE_ZLIB - unzFile zipFile = unzOpen((_stylefile + ".zip").c_str()); + unzFile zipFile = unzOpen((getThemeFileName() + ".zip").c_str()); if (zipFile && unzLocateFile(zipFile, cacheFilename.c_str(), 2) == UNZ_OK) { unz_file_info fileInfo; unzOpenCurrentFile(zipFile); @@ -98,7 +98,7 @@ const Graphics::Font *Theme::loadFont(const char *filename) { #ifdef USE_ZLIB if (!font) { - unzFile zipFile = unzOpen((_stylefile + ".zip").c_str()); + unzFile zipFile = unzOpen((getThemeFileName() + ".zip").c_str()); if (zipFile && unzLocateFile(zipFile, filename, 2) == UNZ_OK) { unz_file_info fileInfo; unzOpenCurrentFile(zipFile); |