Merge branch '2.4' of https://github.com/eshifri/edgetx into 2.4

This commit is contained in:
eshifri
2021-06-06 08:43:40 -07:00
11 changed files with 318 additions and 43 deletions
+3 -3
View File
@@ -335,7 +335,7 @@ class InputLineButton : public CommonInputOrMixButton {
{
const ExpoData & line = g_model.expoData[index];
if (line.swtch || line.curve.value != 0 || line.flightModes) {
setHeight(height() + PAGE_LINE_HEIGHT);
setHeight(height() + PAGE_LINE_HEIGHT + FIELD_PADDING_TOP);
}
}
@@ -353,13 +353,13 @@ class InputLineButton : public CommonInputOrMixButton {
drawSource(dc, 60, FIELD_PADDING_TOP, line.srcRaw);
if (line.name[0]) {
dc->drawMask(146, 2 + FIELD_PADDING_TOP, mixerSetupLabelIcon, DEFAULT_COLOR);
dc->drawMask(146, FIELD_PADDING_TOP, mixerSetupLabelIcon, DEFAULT_COLOR);
dc->drawSizedText(166, FIELD_PADDING_TOP, line.name, sizeof(line.name));
}
// second line ...
if (line.swtch) {
dc->drawMask(3, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP + 2, mixerSetupSwitchIcon, DEFAULT_COLOR);
dc->drawMask(3, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, mixerSetupSwitchIcon, DEFAULT_COLOR);
drawSwitch(dc, 21, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, line.swtch);
}
+4 -4
View File
@@ -233,7 +233,7 @@ class MixLineButton : public CommonInputOrMixButton {
{
const MixData & mix = g_model.mixData[index];
if (mix.swtch || mix.curve.value != 0 || mix.flightModes) {
setHeight(height() + PAGE_LINE_HEIGHT);
setHeight(height() + PAGE_LINE_HEIGHT + FIELD_PADDING_TOP);
}
}
@@ -251,13 +251,13 @@ class MixLineButton : public CommonInputOrMixButton {
drawSource(dc, 60, FIELD_PADDING_TOP, line.srcRaw);
if (line.name[0]) {
dc->drawMask(146, 2 + FIELD_PADDING_TOP, mixerSetupLabelIcon, DEFAULT_COLOR);
dc->drawMask(146, FIELD_PADDING_TOP, mixerSetupLabelIcon, DEFAULT_COLOR);
dc->drawSizedText(166, FIELD_PADDING_TOP, line.name, sizeof(line.name));
}
// second line ...
if (line.swtch) {
dc->drawMask(3, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP + 2, mixerSetupSwitchIcon, DEFAULT_COLOR);
dc->drawMask(3, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, mixerSetupSwitchIcon, DEFAULT_COLOR);
drawSwitch(dc, 21, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, line.swtch);
}
@@ -521,4 +521,4 @@ bool swapMixes(uint8_t &idx, uint8_t up)
idx = tgt_idx;
return true;
}
}
+3 -3
View File
@@ -114,7 +114,7 @@ class OutputLineButton : public Button {
output(output)
{
if (output->revert || output->curve || output->name[0]) {
setHeight(height() + PAGE_LINE_HEIGHT);
setHeight(height() + PAGE_LINE_HEIGHT + FIELD_PADDING_TOP);
}
}
@@ -125,7 +125,7 @@ class OutputLineButton : public Button {
dc->drawNumber(68, FIELD_PADDING_TOP, output->max + 1000, PREC1);
dc->drawNumber(132, FIELD_PADDING_TOP, output->offset, PREC1);
dc->drawNumber(226, FIELD_PADDING_TOP, PPM_CENTER + output->ppmCenter, RIGHT);
dc->drawText(228, FIELD_PADDING_TOP, output->symetrical ? "=" : "\206");
dc->drawText(228, FIELD_PADDING_TOP, output->symetrical ? "=" : "\210");
// second line
if (output->revert) {
@@ -136,7 +136,7 @@ class OutputLineButton : public Button {
dc->drawText(88, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, getCurveString(output->curve));
}
if (output->name[0]) {
dc->drawMask(146, 2 + PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, mixerSetupLabelIcon, DEFAULT_COLOR);
dc->drawMask(146, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, mixerSetupLabelIcon, DEFAULT_COLOR);
dc->drawSizedText(166, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, output->name, sizeof(output->name));
}
+2 -2
View File
@@ -149,7 +149,7 @@ class SpecialFunctionEditPage : public Page {
[=](std::string newValue) {
strncpy(cfn->play.name, newValue.c_str(), sizeof(cfn->play.name));
SET_DIRTY();
});
}, true); // strip extension
grid.nextLine();
break;
@@ -272,7 +272,7 @@ class SpecialFunctionButton : public Button {
uint8_t func = CFN_FUNC(cfn);
if (!cfn->isEmpty() &&
(HAS_ENABLE_PARAM(func) || HAS_REPEAT_PARAM(func) || (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT))) {
setHeight(height() + 20);
setHeight(line2 + PAGE_LINE_HEIGHT);
}
}
+2 -1
View File
@@ -141,7 +141,8 @@ void ViewMain::updateTopbarVisibility()
int leftScroll = getScrollPositionX() % pageWidth;
if (leftScroll == 0) {
setTopbarVisible(hasTopbar(g_model.view));
customScreens[g_model.view]->adjustLayout();
if (customScreens[g_model.view])
customScreens[g_model.view]->adjustLayout();
}
else {
int leftIdx = getScrollPositionX() / pageWidth;