From 6dee3187cdc7f9b5aa29180541e9733d915a5a3a Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 27 Jul 2021 22:54:25 +0800 Subject: [PATCH] Fixed NV14 slider position, compatible with TX16S alignment. --- radio/src/gui/colorlcd/view_main_decoration.cpp | 3 ++- radio/src/targets/nv14/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/view_main_decoration.cpp b/radio/src/gui/colorlcd/view_main_decoration.cpp index 9f876ab10..b10c771d1 100644 --- a/radio/src/gui/colorlcd/view_main_decoration.cpp +++ b/radio/src/gui/colorlcd/view_main_decoration.cpp @@ -116,11 +116,12 @@ void ViewMainDecoration::adjustDecoration() sl->setTop(pos); if (IS_POT_MULTIPOS(POT2)) { sl->setWidth(MULTIPOS_W); + sl->setLeft((width() - sl->width()) / 2); // This is the position of middle multipos pot } else { // if !IS_POT(POT2) -> sliders[SLIDERS_POT2] == nullptr sl->setWidth(HORIZONTAL_SLIDERS_WIDTH); + sl->setLeft(width() - sl->width() - HMARGIN); // Normal pot position, align to right } - sl->setLeft((width() - sl->width()) / 2); } #if defined(HARDWARE_POT3) diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt index 530e3e7b7..ad5dda406 100644 --- a/radio/src/targets/nv14/CMakeLists.txt +++ b/radio/src/targets/nv14/CMakeLists.txt @@ -16,7 +16,7 @@ set(STORAGE_FORMAT BIN) set(HAPTIC YES) set(GUI_DIR colorlcd) set(BITMAPS_DIR 480x272) -#set(HARDWARE_EXTERNAL_MODULE YES) +set(HARDWARE_EXTERNAL_MODULE YES) #set(AUX_SERIAL ON) # set(NAVIGATION_TYPE touch) set(TARGET_DIR nv14)