From 5196c2a9164096914a921d371fbdea40082cde5a Mon Sep 17 00:00:00 2001 From: eshifri <46511024+eshifri@users.noreply.github.com> Date: Sat, 7 May 2022 22:58:51 -0700 Subject: [PATCH] feat (colorlcd): Move input name together with input row content (#1940) --- radio/src/gui/colorlcd/model_inputs.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/model_inputs.cpp b/radio/src/gui/colorlcd/model_inputs.cpp index 691d058e2..67c3af935 100644 --- a/radio/src/gui/colorlcd/model_inputs.cpp +++ b/radio/src/gui/colorlcd/model_inputs.cpp @@ -617,8 +617,12 @@ void ModelInputsPage::build(FormWindow *window, int8_t focusIndex) menu->addLine(STR_PASTE, [=]() { copyExpo(s_copySrcIdx, inputIndex, input); if (s_copyMode == MOVE_MODE) { - deleteExpo((s_copySrcIdx >= inputIndex) ? s_copySrcIdx + 1 - : s_copySrcIdx); + int sourceInd = s_copySrcIdx >= inputIndex ? s_copySrcIdx + 1 + : s_copySrcIdx; + memcpy(g_model.inputNames[expoAddress(inputIndex)->chn], + g_model.inputNames[expoAddress(sourceInd)->chn], + LEN_INPUT_NAME); + deleteExpo(sourceInd); s_copyMode = 0; } rebuild(window, inputIndex);