piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(color): remove unnecessary scroll bars from theme editor (#6740)

Browse Source
This commit is contained in:
philmoz
2025-10-28 07:55:58 +10:00
committed by GitHub
parent f72fcc3f25
commit 230bf579dc
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/radio/preview_window.h
+1 -1
View File
@@ -38,7 +38,7 @@ class PreviewWindow : public Window
static LAYOUT_VAL_SCALED(ICON_X2, 38)
static LAYOUT_VAL_SCALED(ICON_X3, 71)
static LAYOUT_VAL_SCALED(ICON_Y, 5)
static LAYOUT_VAL_SCALED(DATE_XO, 44)
static LAYOUT_VAL_SCALED(DATE_XO, 46)
static LAYOUT_VAL_SCALED(CBT_Y, 44)
static LAYOUT_VAL_SCALED(CBT_W, 100)
static LAYOUT_VAL_SCALED(CB1_X, 100)
radio/src/gui/colorlcd/radio/radio_theme.cpp
+14 -14
View File
@@ -240,10 +240,10 @@ class ColorEditPage : public Page
form->padAll(PAD_SMALL);
#if LANDSCAPE
form->setFlexLayout(LV_FLEX_FLOW_ROW, PAD_SMALL);
rect_t r = {0, 0, COLOR_LIST_SIZE, form->height() - PAD_LARGE};
rect_t r = {0, 0, COLOR_LIST_SIZE, form->height() - 2 * PAD_SMALL};
#else
form->setFlexLayout(LV_FLEX_FLOW_COLUMN, PAD_SMALL);
rect_t r = {0, 0, form->width() - PAD_LARGE, COLOR_LIST_SIZE};
rect_t r = {0, 0, form->width() - 2 * PAD_SMALL, COLOR_LIST_SIZE};
#endif
Window *colForm = new Window(form, r);
@@ -251,9 +251,9 @@ class ColorEditPage : public Page
colForm->setFlexLayout(LV_FLEX_FLOW_COLUMN, PAD_SMALL, r.w);
#if LANDSCAPE
r.w = form->width() - COLOR_LIST_SIZE - PAD_MEDIUM * 2;
r.w = form->width() - COLOR_LIST_SIZE - 3 * PAD_SMALL;
#else
r.h = form->height() - COLOR_LIST_SIZE - PAD_MEDIUM * 2;
r.h = form->height() - COLOR_LIST_SIZE - 3 * PAD_SMALL;
#endif
_previewWindow = new PreviewWindow(form, r, _theme->getColorList());
@@ -403,10 +403,10 @@ class ThemeEditPage : public Page
form->padAll(PAD_SMALL);
#if LANDSCAPE
form->setFlexLayout(LV_FLEX_FLOW_ROW, PAD_SMALL);
rect_t r = {0, 0, ColorEditPage::COLOR_LIST_SIZE, form->height() - PAD_LARGE};
rect_t r = {0, 0, ColorEditPage::COLOR_LIST_SIZE, form->height() - 2 * PAD_SMALL};
#else
form->setFlexLayout(LV_FLEX_FLOW_COLUMN, PAD_SMALL);
rect_t r = {0, 0, form->width() - PAD_LARGE, ColorEditPage::COLOR_LIST_SIZE};
rect_t r = {0, 0, form->width() - 2 * PAD_SMALL, ColorEditPage::COLOR_LIST_SIZE};
#endif
_cList = new ColorList(form, r, _theme.getColorList());
@@ -414,9 +414,9 @@ class ThemeEditPage : public Page
_cList->setPressHandler([=]() { editColorPage(); });
#if LANDSCAPE
r.w = form->width() - ColorEditPage::COLOR_LIST_SIZE - PAD_MEDIUM * 2;
r.w = form->width() - ColorEditPage::COLOR_LIST_SIZE - 3 * PAD_SMALL;
#else
r.h = form->height() - ColorEditPage::COLOR_LIST_SIZE - PAD_MEDIUM * 2;
r.h = form->height() - ColorEditPage::COLOR_LIST_SIZE - 3 * PAD_SMALL;
#endif
_previewWindow = new PreviewWindow(form, r, _theme.getColorList());
}
@@ -605,9 +605,9 @@ void ThemeSetupPage::build(Window *window)
pageWindow = window;
#if LANDSCAPE
window->setFlexLayout(LV_FLEX_FLOW_ROW, PAD_TINY);
window->setFlexLayout(LV_FLEX_FLOW_ROW, PAD_SMALL);
#else
window->setFlexLayout(LV_FLEX_FLOW_COLUMN, PAD_TINY);
window->setFlexLayout(LV_FLEX_FLOW_COLUMN, PAD_SMALL);
#endif
auto tp = ThemePersistance::instance();
@@ -624,7 +624,7 @@ void ThemeSetupPage::build(Window *window)
#if LANDSCAPE
rect_t r = {0, 0, LIST_SIZE, window->height() - 2 * PAD_SMALL};
#else
rect_t r = {0, 0, window->width() - PAD_LARGE, LIST_SIZE};
rect_t r = {0, 0, window->width() - 2 * PAD_SMALL, LIST_SIZE};
#endif
setupListbox(window, r, tp);
@@ -641,11 +641,11 @@ void ThemeSetupPage::build(Window *window)
themeColorPreview->setWidth(r.w);
#if LANDSCAPE
r.w = window->width() - LIST_SIZE - COLOR_PREVIEW_SIZE - PAD_LARGE - PAD_MEDIUM;
r.w = window->width() - LIST_SIZE - COLOR_PREVIEW_SIZE - 4 * PAD_SMALL;
r.h = window->height() - 2 * PAD_SMALL;
#else
r.w = window->width() - PAD_LARGE;
r.h = window->height() - LIST_SIZE - COLOR_PREVIEW_SIZE - PAD_LARGE - PAD_MEDIUM;
r.w = window->width() - 2 * PAD_SMALL;
r.h = window->height() - LIST_SIZE - COLOR_PREVIEW_SIZE - 4 * PAD_SMALL;
#endif
auto rw = new Window(window, r);