Horus/fix #4036 (#4038)

* Remove 'static' from bitmapbuffer that where causing issues when changing theme. I have checked that this does not create extra sdcard access * Cosmetics * Move calibration bitmaps to theme * Overlaping PR * There no theme changing during shutdown * Cosmetics
2016-11-18 18:51:11 +01:00
parent d59fdc07c4
commit 6c006c3e2c
6 changed files with 43 additions and 32 deletions
@@ -154,6 +154,19 @@ class DefaultTheme: public Theme

    void loadThemeBitmaps() const
    {
+      // Calibration screen
+      delete calibStick;
+      calibStick = BitmapBuffer::load(getThemePath("stick_pointer.png"));
+
+      delete calibStickBackground;
+      calibStickBackground = BitmapBuffer::load(getThemePath("stick_background.png"));
+
+      delete calibTrackpBackground;
+      calibTrackpBackground = BitmapBuffer::load(getThemePath("trackp_background.png"));
+
+      delete calibHorus;
+      calibHorus = BitmapBuffer::load(getThemePath("horus.bmp"));
+
      // Model Selection screen
      delete modelselIconBitmap;
      modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TITLE_BGCOLOR, TEXT_BGCOLOR);