From 90c23a15a54b2fe5452d49e0021828985292cce2 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sun, 23 Jan 2022 14:40:42 +0100
Subject: [PATCH] select fab carousel: fix dimensions

---
 radio/src/gui/colorlcd/fab_button.cpp        |  3 +--
 radio/src/gui/colorlcd/fullscreen_dialog.cpp | 10 ++++++----
 radio/src/gui/colorlcd/select_fab_button.cpp |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/radio/src/gui/colorlcd/fab_button.cpp b/radio/src/gui/colorlcd/fab_button.cpp
index 2a4a75266..e760375c7 100644
--- a/radio/src/gui/colorlcd/fab_button.cpp
+++ b/radio/src/gui/colorlcd/fab_button.cpp
@@ -38,8 +38,7 @@ FabButton::FabButton(FormGroup* parent, coord_t x, coord_t y, uint8_t icon,
                      std::function<uint8_t(void)> pressHandler,
                      WindowFlags windowFlags) :
     Button(parent,
-           {x - FAB_BUTTON_SIZE / 2, y - FAB_BUTTON_SIZE / 2, FAB_BUTTON_SIZE,
-            FAB_BUTTON_SIZE},
+           {x, y, FAB_BUTTON_SIZE, FAB_BUTTON_SIZE},
            pressHandler, windowFlags),
     icon(icon)
 {
diff --git a/radio/src/gui/colorlcd/fullscreen_dialog.cpp b/radio/src/gui/colorlcd/fullscreen_dialog.cpp
index 83c8e1332..ac79f18b7 100644
--- a/radio/src/gui/colorlcd/fullscreen_dialog.cpp
+++ b/radio/src/gui/colorlcd/fullscreen_dialog.cpp
@@ -42,10 +42,12 @@ FullScreenDialog::FullScreenDialog(
   Layer::push(this);
 
 #if defined(HARDWARE_TOUCH)
-  new FabButton(this, LCD_W - 50, LCD_H - 50, ICON_NEXT, [=]() -> uint8_t {
-    if (confirmHandler) confirmHandler();
-    return 0;
-  });
+  new FabButton(this, LCD_W - (FAB_BUTTON_SIZE + PAGE_PADDING),
+                LCD_H - (FAB_BUTTON_SIZE + PAGE_PADDING), ICON_NEXT,
+                [=]() -> uint8_t {
+                  if (confirmHandler) confirmHandler();
+                  return 0;
+                });
 #endif
 
   bringToTop();
diff --git a/radio/src/gui/colorlcd/select_fab_button.cpp b/radio/src/gui/colorlcd/select_fab_button.cpp
index e79c4587d..40392048d 100644
--- a/radio/src/gui/colorlcd/select_fab_button.cpp
+++ b/radio/src/gui/colorlcd/select_fab_button.cpp
@@ -26,7 +26,7 @@ SelectFabButton::SelectFabButton(FormGroup* parent, coord_t x, coord_t y,
                                  std::function<uint8_t(void)> pressHandler,
                                  WindowFlags windowFlags) :
     // FabButton uses center coordinates, we want top left corner:
-    FabButton(parent, x + FAB_BUTTON_SIZE / 2, y + FAB_BUTTON_SIZE / 2, icon,
+    FabButton(parent, x, y, icon,
               pressHandler, windowFlags),
     title(title)
 {