Skip to content

fix(color): channel bars overlap close button in joystick channel edit window #7694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pfeerick merged 1 commit into from
Aug 24, 2026
+3 −4
Merged

fix(color): channel bars overlap close button in joystick channel edit window #7694

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions radio/src/gui/colorlcd/model/model_usbjoystick.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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);
}
Expand Down