* 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
This commit is contained in:
3djc
2016-11-18 18:51:11 +01:00
committed by Bertrand Songis
parent d59fdc07c4
commit 6c006c3e2c
6 changed files with 43 additions and 32 deletions
+9 -20
View File
@@ -120,29 +120,18 @@ class DarkblueTheme: public Theme
void loadThemeBitmaps() const
{
// Model Selection screen
delete modelselIconBitmap;
modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TEXT_BGCOLOR, TITLE_BGCOLOR);
if (modelselIconBitmap) {
BitmapBuffer * bitmap = BitmapBuffer::load(getThemePath("modelsel/icon_default.png"));
modelselIconBitmap->drawBitmap(25, 8, bitmap);
delete bitmap;
}
// Calibration screen
delete calibStick;
calibStick = BitmapBuffer::load(getThemePath("stick_pointer.png"));
delete modelselSdFreeBitmap;
modelselSdFreeBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_sdfree.png", TEXT_COLOR, TEXT_BGCOLOR);
delete calibStickBackground;
calibStickBackground = BitmapBuffer::load(getThemePath("stick_background.png"));
delete modelselModelQtyBitmap;
modelselModelQtyBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelqty.png", TEXT_COLOR, TEXT_BGCOLOR);
delete calibTrackpBackground;
calibTrackpBackground = BitmapBuffer::load(getThemePath("trackp_background.png"));
delete modelselModelNameBitmap;
modelselModelNameBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelname.png", TEXT_COLOR, TEXT_BGCOLOR);
delete modelselModelMoveBackground;
modelselModelMoveBackground = BitmapBuffer::loadMask(getThemePath("modelsel/mask_moveback.png"));
delete modelselModelMoveIcon;
modelselModelMoveIcon = BitmapBuffer::loadMask(getThemePath("modelsel/mask_moveico.png"));
delete calibHorus;
calibHorus = BitmapBuffer::load(getThemePath("horus.bmp"));
// Channels monitor screen
delete chanMonLockedBitmap;