From b484ada5beb5e0e1e4316c2cf496714a498161cd Mon Sep 17 00:00:00 2001 From: philmoz Date: Tue, 25 Aug 2026 08:26:19 +1000 Subject: [PATCH] fix(color): channel bars overlap close button in joystick channel edit window (#7694) --- radio/src/gui/colorlcd/model/model_usbjoystick.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/colorlcd/model/model_usbjoystick.cpp b/radio/src/gui/colorlcd/model/model_usbjoystick.cpp index ea9566467..748dc4b5d 100644 --- a/radio/src/gui/colorlcd/model/model_usbjoystick.cpp +++ b/radio/src/gui/colorlcd/model/model_usbjoystick.cpp @@ -220,8 +220,7 @@ class USBChannelEditWindow : public Page buildBody(body); } - static LAYOUT_SIZE_SCALED(USBCH_EDIT_STATUS_BAR_WIDTH, 250, 160) - static LAYOUT_SIZE(USBCH_EDIT_RIGHT_MARGIN, 0, 3) + static LAYOUT_SIZE_SCALED(USBCH_EDIT_STATUS_BAR_WIDTH, 250, 120) static LAYOUT_SIZE(USBCH_COLS, 4, 2) protected: @@ -277,8 +276,8 @@ class USBChannelEditWindow : public Page statusBar = new USBChannelEditStatusBar( window, - {window->getRect().w - USBCH_EDIT_STATUS_BAR_WIDTH - - USBCH_EDIT_RIGHT_MARGIN, + {window->getRect().w - USBCH_EDIT_STATUS_BAR_WIDTH - PAD_TINY - + PageGroup::PAGE_GROUP_BACK_BTN_XO, 0, USBCH_EDIT_STATUS_BAR_WIDTH, EdgeTxStyles::MENU_HEADER_HEIGHT}, channel); }