Ticket #4103: gui_bitmap_v1.patch

ThemeEngine.cpp

@@ -397 +397 @@
                 }
         }
         
+        _bitmapFormat = _system->getOverlayFormat();
         // Load the theme
         // We pass the theme file here by default, so the user will
         // have a descriptive error message. The only exception will
@@ -414 +415 @@
 }
 
 void ThemeEngine::refresh() {
+        Graphics::PixelFormat fmt = _system->getOverlayFormat();
+        if (fmt != _bitmapFormat) {
+                for (ImagesMap::iterator i = _bitmaps.begin(); i != _bitmaps.end(); ++i) {
+                        if (!i->_value)
+                                continue;
+
+                        i->_value->free();
+                        delete i->_value;
+                        Graphics::Surface *surf = Graphics::ImageDecoder::loadFile(i->_key);
+                        if (!surf && _themeArchive) {
+                                Common::SeekableReadStream *stream = _themeArchive->openFile(i->_key);
+                                if (stream) {
+                                        surf = Graphics::ImageDecoder::loadFile(*stream);
+                                        delete stream;
+                                }
+                        }
+
+                        i->_value = surf;
+                }
+
+                _bitmapFormat = fmt;
+        }
+
         init();
+
         if (_enabled) {
                 _system->showOverlay();
 

ThemeEngine.h

@@ -583 +583 @@
         /** Array of all the text fonts that can be drawn. */
         TextDrawData *_texts[kTextDataMAX];
 
+        Graphics::PixelFormat _bitmapFormat;
         ImagesMap _bitmaps;
 
         /** List of all the dirty screens that must be blitted to the overlay. */