Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-26 17:55:12 +03:00
Code Activity

Fixed pasting logical switch

Browse source
This commit is contained in:
Raphael Coeffic 2021-05-27 07:13:17 +02:00
parent dee7a3ea6b
commit a7aefb7788
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
radio/src/gui/colorlcd/model_logical_switches.cpp
View file

@ -352,10 +352,21 @@ void ModelLogicalSwitchesPage::build(FormWindow * window, int8_t focusIndex)
for (uint8_t i = 0; i < MAX_LOGICAL_SWITCHES; i++) { for (uint8_t i = 0; i < MAX_LOGICAL_SWITCHES; i++) {
LogicalSwitchData * ls = lswAddress(i); LogicalSwitchData * ls = lswAddress(i);
if (ls->func == LS_FUNC_NONE) { if (ls->func == LS_FUNC_NONE) {
auto button = new TextButton(window, grid.getLabelSlot(), getSwitchPositionName(SWSRC_SW1+i)); auto button = new TextButton(window, grid.getLabelSlot(), getSwitchPositionName(SWSRC_SW1+i));
button->setPressHandler([=]() { button->setPressHandler([=]() {
editLogicalSwitch(window, i); if (clipboard.type == CLIPBOARD_TYPE_CUSTOM_SWITCH) {
Menu* menu = new Menu(window);
menu->addLine(STR_EDIT, [=]() { editLogicalSwitch(window, i); });
menu->addLine(STR_PASTE, [=]() {
*ls = clipboard.data.csw;
storageDirty(EE_MODEL);
rebuild(window, i);
});
} else {
editLogicalSwitch(window, i);
}
return 0; return 0;
}); });
grid.spacer(button->height() + 5); grid.spacer(button->height() + 5);
@ -366,7 +377,6 @@ void ModelLogicalSwitchesPage::build(FormWindow * window, int8_t focusIndex)
auto button = new LogicalSwitchButton(window, grid.getFieldSlot(), i); auto button = new LogicalSwitchButton(window, grid.getFieldSlot(), i);
button->setPressHandler([=]() { button->setPressHandler([=]() {
Menu * menu = new Menu(window); Menu * menu = new Menu(window);
LogicalSwitchData * ls = lswAddress(i);
menu->addLine(STR_EDIT, [=]() { menu->addLine(STR_EDIT, [=]() {
editLogicalSwitch(window, i); editLogicalSwitch(window, i);
}); });