piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix colors on the new slowdelay bitmap (#3644)

Browse Source 
Optimize code a little
This commit is contained in:
3djc
2016-07-04 20:26:11 +02:00
committed by Bertrand Songis
parent 4148643492
commit e5e02927af
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/horus/menu_model_mixes.cpp
+5 -4
View File
@@ -553,13 +553,14 @@ bool menuModelMixAll(evt_t event)
displayMixLine(y, md);
BitmapBuffer * delayslow = 0;
BitmapBuffer *delayslowbmp[] = {mixerSetupSlowBitmap, mixerSetupDelayBitmap, mixerSetupDelaySlowBitmap};
uint8_t delayslow = 0;
if (md->speedDown || md->speedUp)
delayslow = mixerSetupSlowBitmap;
delayslow = 1;
if (md->delayUp || md->delayDown)
delayslow = (delayslow ? mixerSetupDelaySlowBitmap : mixerSetupDelayBitmap );
delayslow += 2;
if (delayslow)
lcd->drawBitmap(MIX_LINE_DELAY_SLOW_POS, y + 2, delayslow);
lcd->drawBitmap(MIX_LINE_DELAY_SLOW_POS, y + 2, delayslowbmp[delayslow - 1]);
if (s_copyMode) {
if ((s_copyMode==COPY_MODE || s_copyTgtOfs == 0) && s_copySrcCh == ch && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
radio/src/gui/horus/themes/darkblue.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ class DarkblueTheme: public Theme
mixerSetupDelayBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delay.png", TEXT_COLOR, TEXT_BGCOLOR);
delete mixerSetupDelaySlowBitmap;
mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", TEXT_BGCOLOR, TEXT_COLOR);
mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", TEXT_COLOR, TEXT_BGCOLOR);
delete mixerSetupFlightmodeBitmap;
mixerSetupFlightmodeBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_fm.png", TEXT_COLOR, TEXT_BGCOLOR);
radio/src/gui/horus/themes/default.cpp
+1 -1
View File
@@ -220,7 +220,7 @@ class DefaultTheme: public Theme
mixerSetupDelayBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delay.png", TEXT_COLOR, TEXT_BGCOLOR);
delete mixerSetupDelaySlowBitmap;
mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", TEXT_BGCOLOR, TEXT_COLOR);
mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", TEXT_COLOR, TEXT_BGCOLOR);
}
virtual void load() const