From 5334886a3da4de3d1c499b0f9ea661aaaf49eb86 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 5 Apr 2021 17:25:00 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/colorlcd/layouts/layout1x1.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/colorlcd/layouts/layout1x1.cpp b/radio/src/gui/colorlcd/layouts/layout1x1.cpp index 711ebe2a2..efa3372d8 100644 --- a/radio/src/gui/colorlcd/layouts/layout1x1.cpp +++ b/radio/src/gui/colorlcd/layouts/layout1x1.cpp @@ -74,10 +74,8 @@ class Layout1x1: public Layout return 1; } - rect_t getZone(unsigned int index) const override + rect_t getMainZone(rect_t zone) const { - rect_t zone = {10, 10, LCD_W - 2 * border, LCD_H - 2 * border}; - if (HAS_TOPBAR()) { zone.y += MENU_HEADER_HEIGHT; zone.h -= MENU_HEADER_HEIGHT; @@ -103,6 +101,13 @@ class Layout1x1: public Layout return zone; } + rect_t getZone(unsigned int index) const override + { + rect_t zone = getMainZone({border, border, LCD_W - 2 * border, LCD_H - 2 * border}); + + return zone; + } + void checkEvents() override { Layout::checkEvents();