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

Merge pull request #608 from eshifri/eshifri/delayIcons

Browse Source 
Implements showing of delay/slow icons on the mixes page
This commit is contained in:
Peter Feerick
2021-08-22 12:46:20 +10:00
committed by GitHub
parent 83413a2242 4f111cfa78
commit 7e1980e148
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/bitmaps.h
+3 -3
View File
@@ -102,8 +102,8 @@ extern BitmapBuffer * mixerSetupLabelIcon;
extern BitmapBuffer * mixerSetupFlightmodeIcon;
extern BitmapBuffer * mixerSetupCurveIcon;
extern BitmapBuffer * mixerSetupSwitchIcon;
//extern BitmapBuffer * mixerSetupDelayIcon;
//extern BitmapBuffer * mixerSetupSlowIcon;
//extern BitmapBuffer * mixerSetupDelaySlowIcon;
extern BitmapBuffer * mixerSetupDelayIcon;
extern BitmapBuffer * mixerSetupSlowIcon;
extern BitmapBuffer * mixerSetupDelaySlowIcon;
#endif // _BITMAPS_H_
radio/src/gui/colorlcd/model_mixes.cpp
+9
View File
@@ -286,6 +286,15 @@ class MixLineButton : public CommonInputOrMixButton
if (line.flightModes) {
drawFlightModes(dc, line.flightModes, textColor);
}
// Put this icon on the first line, since we jave more space there
uint8_t delayslow = 0;
if (line.speedDown || line.speedUp) delayslow = 1;
if (line.delayUp || line.delayDown) delayslow += 2;
if (delayslow) {
BitmapBuffer *delayslowbmp[] = {mixerSetupSlowIcon, mixerSetupDelayIcon, mixerSetupDelaySlowIcon};
dc->drawMask(width() - 16, FIELD_PADDING_TOP, delayslowbmp[delayslow - 1], textColor);
}
}
};
radio/src/gui/colorlcd/themes/480_default.cpp
+8 -8
View File
@@ -296,14 +296,14 @@ class Theme480: public OpenTxTheme
delete mixerSetupFlightmodeIcon;
mixerSetupFlightmodeIcon = BitmapBuffer::load8bitMask(mask_textline_fm);
// delete mixerSetupSlowIcon;
// mixerSetupSlowIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_slow.png"));
//
// delete mixerSetupDelayIcon;
// mixerSetupDelayIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_delay.png"));
//
// delete mixerSetupDelaySlowIcon;
// mixerSetupDelaySlowIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_delayslow.png"));
delete mixerSetupSlowIcon;
mixerSetupSlowIcon = BitmapBuffer::load8bitMask(mask_textline_slow);
delete mixerSetupDelayIcon;
mixerSetupDelayIcon = BitmapBuffer::load8bitMask(mask_textline_delay);
delete mixerSetupDelaySlowIcon;
mixerSetupDelaySlowIcon = BitmapBuffer::load8bitMask(mask_textline_delayslow);
}
void load() const override