From 1363a89758082f3499e8ded81e11fa832b0ed22c Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Mon, 6 Jun 2022 14:55:40 +0200
Subject: [PATCH] Move "Extended limits" to outputs screen

---
 radio/src/gui/colorlcd/model_outputs.cpp | 31 ++++++++++++++++++------
 radio/src/gui/colorlcd/model_setup.cpp   |  6 -----
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/radio/src/gui/colorlcd/model_outputs.cpp b/radio/src/gui/colorlcd/model_outputs.cpp
index b25c62b2b..e4241e073 100644
--- a/radio/src/gui/colorlcd/model_outputs.cpp
+++ b/radio/src/gui/colorlcd/model_outputs.cpp
@@ -150,14 +150,29 @@ void ModelOutputsPage::build(FormWindow *window)
   window->setFlexLayout(LV_FLEX_FLOW_COLUMN, 8);
   lv_obj_set_style_pad_all(window->getLvObj(), 8, 0);
 
-  auto btn = new TextButton(window, rect_t{}, STR_ADD_ALL_TRIMS_TO_SUBTRIMS,
-      [=]() {
-        moveTrimsToOffsets();
-        // TODO: mass invalidate
-        return 0;
-      });
-  auto btn_obj = btn->getLvObj();
-  lv_obj_set_width(btn_obj, lv_pct(100));
+  auto form = new FormGroup(window, rect_t{});
+  form->setFlexLayout(LV_FLEX_FLOW_ROW_WRAP, lv_dpx(8));
+
+  auto form_obj = form->getLvObj();
+  lv_obj_set_style_pad_all(form_obj, lv_dpx(8), 0);
+  lv_obj_set_style_pad_row(form_obj, lv_dpx(8), 0);
+  lv_obj_set_style_flex_cross_place(form_obj, LV_FLEX_ALIGN_CENTER, 0);
+
+  // auto btn =
+  new TextButton(form, rect_t{}, STR_ADD_ALL_TRIMS_TO_SUBTRIMS, [=]() {
+    moveTrimsToOffsets();
+    window->invalidate();
+    return 0;
+  });
+
+  auto box = new FormGroup(form, rect_t{});
+  box->setFlexLayout(LV_FLEX_FLOW_ROW, lv_dpx(8));
+  auto box_obj = box->getLvObj();
+  lv_obj_set_width(box_obj, LV_SIZE_CONTENT);
+  lv_obj_set_style_flex_cross_place(box_obj, LV_FLEX_ALIGN_CENTER, 0);
+
+  new StaticText(box, rect_t{}, STR_ELIMITS, 0, COLOR_THEME_PRIMARY1);
+  new CheckBox(box, rect_t{}, GET_SET_DEFAULT(g_model.extendedLimits));  
 
   for (uint8_t ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++) {
 
diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp
index b66ae6847..da186d5f0 100644
--- a/radio/src/gui/colorlcd/model_setup.cpp
+++ b/radio/src/gui/colorlcd/model_setup.cpp
@@ -240,12 +240,6 @@ void ModelSetupPage::build(FormWindow * window)
   // TODO: show bitmap thumbnail instead?
   new ModelBitmapEdit(line, rect_t{});
 
-  // Extended limits
-  // TODO: move to "Outputs" screen ?
-  line = window->newLine(&grid);
-  new StaticText(line, rect_t{}, STR_ELIMITS, 0, COLOR_THEME_PRIMARY1);
-  new CheckBox(line, rect_t{}, GET_SET_DEFAULT(g_model.extendedLimits));
-
   // Global functions
   line = window->newLine(&grid);
   new StaticText(line, rect_t{}, STR_USE_GLOBAL_FUNCS, 0, COLOR_THEME_PRIMARY1);