Revised input edit page for color LCD radios.

EdgeTX · May 29, 2024 · 48087c7 · 48087c7
1 parent c19f640
commit 48087c7
Show file tree

Hide file tree

Showing 24 changed files with 297 additions and 222 deletions.
diff --git a/radio/src/gui/colorlcd/fm_matrix.cpp b/radio/src/gui/colorlcd/fm_matrix.cpp
@@ -24,29 +24,26 @@
 #include "opentx.h"
 #include "themes/etx_lv_theme.h"
 
-template <class T>
-FMMatrix<T>::FMMatrix(Window* parent, const rect_t& r, T* input) :
+template<class T>
+FMMatrix<T>::FMMatrix(Window* parent, const rect_t& r, T* input, uint8_t columns) :
     ButtonMatrix(parent, r), input(input)
 {
 #if LCD_W > LCD_H
-  initBtnMap(5, MAX_FLIGHT_MODES);
+  if (columns == 0) columns = 5;
 #else
-  initBtnMap(3, MAX_FLIGHT_MODES);
+  if (columns == 0) columns = 3;
 #endif
 
+  initBtnMap(columns, MAX_FLIGHT_MODES);
+
   for (int i = 0; i < MAX_FLIGHT_MODES; i++) {
     setTextAndState(i);
   }
 
   update();
 
-#if LCD_W > LCD_H
-  lv_obj_set_width(lvobj, 258);
-  lv_obj_set_height(lvobj, 73);
-#else
-  lv_obj_set_width(lvobj, 156);
-  lv_obj_set_height(lvobj, 108);
-#endif
+  lv_obj_set_width(lvobj, columns * 51 + 3);
+  lv_obj_set_height(lvobj, ((MAX_FLIGHT_MODES + columns- 1) / columns) * 35 + 3);
 
   padAll(PAD_SMALL);
 }

diff --git a/radio/src/gui/colorlcd/fm_matrix.h b/radio/src/gui/colorlcd/fm_matrix.h
@@ -29,7 +29,7 @@ struct MixData;
 template<class T>
 struct FMMatrix : public ButtonMatrix {
   T* input;
-  FMMatrix(Window* parent, const rect_t& rect, T* input);
+  FMMatrix(Window* parent, const rect_t& rect, T* input, uint8_t columns = 0);
   void onPress(uint8_t btn_id);
   bool isActive(uint8_t btn_id);
   void setTextAndState(uint8_t btn_id);