From e5e02927afc334618e1cdfa37b8f1f2bdaa3d17d Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 4 Jul 2016 20:26:11 +0200 Subject: [PATCH] Fix colors on the new slowdelay bitmap (#3644) Optimize code a little --- radio/src/gui/horus/menu_model_mixes.cpp | 9 +++++---- radio/src/gui/horus/themes/darkblue.cpp | 2 +- radio/src/gui/horus/themes/default.cpp | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/horus/menu_model_mixes.cpp b/radio/src/gui/horus/menu_model_mixes.cpp index 391f316ed..850327bd8 100644 --- a/radio/src/gui/horus/menu_model_mixes.cpp +++ b/radio/src/gui/horus/menu_model_mixes.cpp @@ -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))) { diff --git a/radio/src/gui/horus/themes/darkblue.cpp b/radio/src/gui/horus/themes/darkblue.cpp index 8f29702a9..ac65869d5 100644 --- a/radio/src/gui/horus/themes/darkblue.cpp +++ b/radio/src/gui/horus/themes/darkblue.cpp @@ -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); diff --git a/radio/src/gui/horus/themes/default.cpp b/radio/src/gui/horus/themes/default.cpp index f945a990f..872e84b86 100644 --- a/radio/src/gui/horus/themes/default.cpp +++ b/radio/src/gui/horus/themes/default.cpp @@ -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