From e8d82348e01ea9b330bd3c1788cafc65cf979c15 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sun, 3 Jul 2022 07:19:10 +0200
Subject: [PATCH] MPM proto scan: fix RfScanDialog

---
 radio/src/gui/colorlcd/multi_rfprotos.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/radio/src/gui/colorlcd/multi_rfprotos.cpp b/radio/src/gui/colorlcd/multi_rfprotos.cpp
index 55a3e1e90..1f5abdaf1 100644
--- a/radio/src/gui/colorlcd/multi_rfprotos.cpp
+++ b/radio/src/gui/colorlcd/multi_rfprotos.cpp
@@ -26,23 +26,25 @@
 #include "progress.h"
 
 // TODO: format for LCD_WIDTH > LCD_HEIGHT
-constexpr rect_t RFSCAN_DIALOG_RECT = {
-  50, 100, LCD_W - 100, LCD_H - 200
-};
 
 // TODO: translation
 const char* RFSCAN_TITLE = "MPM: Scanning protocols...";
 
 RfScanDialog::RfScanDialog(Window* parent, MultiRfProtocols* protos,
                            std::function<void()> onClose) :
-  Dialog(parent, RFSCAN_TITLE, RFSCAN_DIALOG_RECT),
+  Dialog(parent, RFSCAN_TITLE, rect_t{}),
   protos(protos),
-  progress(new Progress(&content->form,
-                        {PAGE_PADDING, PAGE_PADDING,
-                            content->form.width() - 2 * PAGE_PADDING,
-                            content->form.height() - 2 * PAGE_PADDING})),
+  progress(new Progress(&content->form, rect_t{})),
   onClose(std::move(onClose))
 {
+  progress->setHeight(LV_DPI_DEF / 4);
+
+  content->setWidth(LCD_W * 0.8);
+  content->updateSize();
+
+  auto content_w = lv_obj_get_content_width(content->form.getLvObj());
+  progress->setWidth(content_w);
+  
   // disable canceling dialog
   setCloseWhenClickOutside(false);
   // setFocus();