Skip to content

Commit 51b38dd

Browse files
philmozphilmoz
authored
fix(color): page layout issues on 320x240 screen size (#6050)
1 parent 062d516 commit 51b38dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+174
-217
lines changed

‎radio/src/gui/colorlcd/controls/channel_range.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ ChannelRange::ChannelRange(Window* parent) : Window(parent, rect_t{})
4545

4646
void ChannelRange::build()
4747
{
48-
chStart = new NumberEdit(this, rect_t{0, 0, 80, 0}, 1, 1,
48+
chStart = new NumberEdit(this, rect_t{0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, 0}, 1, 1,
4949
GET_DEFAULT(1 + getChannelsStart()));
5050
chStart->setSetValueHandler([=](int newValue) { setStart(newValue); });
5151
chStart->setPrefix(STR_CH);
5252

5353
chEnd =
54-
new NumberEdit(this, rect_t{0, 0, 80, 0}, 8, 8,
54+
new NumberEdit(this, rect_t{0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, 0}, 8, 8,
5555
GET_DEFAULT(getChannelsStart() + 8 + getChannelsCount()));
5656

5757
chEnd->setPrefix(STR_CH);

‎radio/src/gui/colorlcd/controls/color_picker.cpp

+4-7
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ class ColorEditorPopup : public BaseDialog
103103
lv_obj_set_flex_align(hbox_obj, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_START,
104104
LV_FLEX_ALIGN_SPACE_AROUND);
105105

106-
colorPad = new ColorSwatch(hbox, {0, 0, COLOR_PAD_WIDTH, COLOR_PAD_HEIGHT},
106+
colorPad = new ColorSwatch(hbox, {0, 0, COLOR_PAD_WIDTH, EdgeTxStyles::STD_FONT_HEIGHT},
107107
COLOR_THEME_PRIMARY1);
108108

109-
hexStr = new StaticText(hbox, {0, 0, CVAL_W, 0}, "", COLOR_THEME_PRIMARY1_INDEX, FONT(L));
109+
hexStr = new StaticText(hbox, {0, 0, EdgeTxStyles::EDIT_FLD_WIDTH, 0}, "", COLOR_THEME_PRIMARY1_INDEX, FONT(L));
110110

111111
updateColor(color);
112112

@@ -149,7 +149,7 @@ class ColorEditorPopup : public BaseDialog
149149

150150
hbox = new Window(vbox, rect_t{});
151151
hbox->padTop(BTN_PAD_TOP);
152-
hbox->setFlexLayout(LV_FLEX_FLOW_ROW, BTN_PAD_ROW);
152+
hbox->setFlexLayout(LV_FLEX_FLOW_ROW, EdgeTxStyles::STD_FONT_HEIGHT);
153153
lv_obj_set_flex_align(hbox->getLvObj(), LV_FLEX_ALIGN_CENTER,
154154
LV_FLEX_ALIGN_END, LV_FLEX_ALIGN_SPACE_BETWEEN);
155155
lv_obj_set_flex_grow(hbox->getLvObj(), 1);
@@ -169,19 +169,16 @@ class ColorEditorPopup : public BaseDialog
169169
static LAYOUT_VAL(CE_SZ, 182, 182, LS(182))
170170
static LAYOUT_VAL2(COLOR_EDIT_WIDTH, LCD_W * 0.8, LCD_W * 0.7)
171171
static LAYOUT_VAL(COLOR_PAD_WIDTH, 52, 52, LS(52))
172-
static LAYOUT_VAL(COLOR_PAD_HEIGHT, 32, 32, LS(32))
173-
static LAYOUT_VAL(CVAL_W, 100, 100, LS(100))
174172
static LAYOUT_VAL(BTN_W, 80, 80, LS(80))
175173
static LAYOUT_VAL(BTN_PAD_TOP, 60, 60, LS(60))
176-
static LAYOUT_VAL(BTN_PAD_ROW, 20, 20, LS(20))
177174
};
178175

179176
ColorPicker::ColorPicker(Window* parent, const rect_t& rect,
180177
std::function<uint32_t()> getValue,
181178
std::function<void(uint32_t)> setValue,
182179
std::function<void(uint32_t)> preview,
183180
COLOR_EDITOR_FMT fmt) :
184-
Button(parent, {rect.x, rect.y, rect.w == 0 ? ColorEditorPopup::COLOR_PAD_WIDTH : rect.w, ColorEditorPopup::COLOR_PAD_HEIGHT}),
181+
Button(parent, {rect.x, rect.y, rect.w == 0 ? ColorEditorPopup::COLOR_PAD_WIDTH : rect.w, EdgeTxStyles::UI_ELEMENT_HEIGHT}),
185182
setValue(std::move(setValue)), preview(std::move(preview)), format(fmt)
186183
{
187184
updateColor(getValue());

‎radio/src/gui/colorlcd/controls/gvar_numberedit.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ GVarNumberEdit::GVarNumberEdit(Window* parent, int32_t vmin,
2626
int32_t vmax, std::function<int32_t()> getValue,
2727
std::function<void(int32_t)> setValue,
2828
LcdFlags textFlags, int32_t voffset, int32_t vdefault) :
29-
Window(parent, {0, 0, NUM_EDIT_W + GV_BTN_W + PAD_TINY * 3, EdgeTxStyles::UI_ELEMENT_HEIGHT + PAD_TINY * 2}),
29+
Window(parent, {0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW + GV_BTN_W + PAD_TINY * 3, EdgeTxStyles::UI_ELEMENT_HEIGHT + PAD_TINY * 2}),
3030
vmin(vmin),
3131
vmax(vmax),
3232
getValue(getValue),
@@ -38,7 +38,7 @@ GVarNumberEdit::GVarNumberEdit(Window* parent, int32_t vmin,
3838

3939
// GVAR field
4040
gvar_field = new Choice(
41-
this, {0, 0, NUM_EDIT_W, 0}, -MAX_GVARS, MAX_GVARS - 1,
41+
this, {0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, 0}, -MAX_GVARS, MAX_GVARS - 1,
4242
[=]() {
4343
uint16_t gvar1 = GV_GET_GV1_VALUE(vmin, vmax);
4444
return GV_INDEX_CALC_DELTA(getValue(), gvar1);
@@ -54,14 +54,14 @@ GVarNumberEdit::GVarNumberEdit(Window* parent, int32_t vmin,
5454
[=](int32_t value) { return getGVarString(value); });
5555

5656
num_field = new NumberEdit(
57-
this, {0, 0, NUM_EDIT_W, 0}, vmin, vmax, [=]() { return getValue() + voffset; },
57+
this, {0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, 0}, vmin, vmax, [=]() { return getValue() + voffset; },
5858
nullptr, textFlags);
5959
num_field->setDefault(vdefault);
6060

6161
#if defined(GVARS)
6262
// The GVAR button
6363
if (modelGVEnabled()) {
64-
m_gvBtn = new TextButton(this, {NUM_EDIT_W + PAD_TINY, 0, GV_BTN_W, 0}, STR_GV, [=]() {
64+
m_gvBtn = new TextButton(this, {EdgeTxStyles::EDIT_FLD_WIDTH_NARROW + PAD_TINY, 0, GV_BTN_W, 0}, STR_GV, [=]() {
6565
switchGVarMode();
6666
return GV_IS_GV_VALUE(getValue(), vmin, vmax);
6767
});

‎radio/src/gui/colorlcd/controls/gvar_numberedit.h

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ class GVarNumberEdit : public Window
4343
void setAccelFactor(int value) { num_field->setAccelFactor(value); }
4444
void setDisplayHandler(std::function<std::string(int value)> function);
4545

46-
static LAYOUT_VAL(NUM_EDIT_W, 70, 70, LS(70))
4746
static LAYOUT_VAL(GV_BTN_W, 40, 40, LS(40))
4847

4948
protected:

‎radio/src/gui/colorlcd/controls/input_source.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ InputSource::InputSource(Window *parent, ExpoData *input) :
110110
line = sensor_form->newLine(grid);
111111
line->padAll(PAD_TINY);
112112
new StaticText(line, rect_t{}, STR_SCALE);
113-
new NumberEdit(line, rect_t{0, 0, 60, 0}, 0,
113+
new NumberEdit(line, rect_t{0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, 0}, 0,
114114
maxTelemValue(input->srcRaw - MIXSRC_FIRST_TELEM + 1),
115115
GET_SET_DEFAULT(input->scale), sensor->getSensorPrec());
116116

‎radio/src/gui/colorlcd/controls/source_numberedit.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SourceNumberEdit::SourceNumberEdit(Window* parent,
3131
int16_t sourceMin,
3232
LcdFlags textFlags, int32_t voffset,
3333
int32_t vdefault) :
34-
Window(parent, {0, 0, NUM_EDIT_W + SRC_BTN_W + PAD_TINY * 3, EdgeTxStyles::UI_ELEMENT_HEIGHT + PAD_TINY * 2}),
34+
Window(parent, {0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW + SRC_BTN_W + PAD_TINY * 3, EdgeTxStyles::UI_ELEMENT_HEIGHT + PAD_TINY * 2}),
3535
vmin(vmin),
3636
vmax(vmax),
3737
sourceMin(sourceMin),
@@ -47,7 +47,7 @@ SourceNumberEdit::SourceNumberEdit(Window* parent,
4747

4848
// Source field
4949
source_field = new SourceChoice(
50-
this, {0, 0, NUM_EDIT_W, 0}, sourceMin, INPUTSRC_LAST,
50+
this, {0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, 0}, sourceMin, INPUTSRC_LAST,
5151
[=]() {
5252
SourceNumVal v;
5353
v.rawValue = getValue();
@@ -59,7 +59,7 @@ SourceNumberEdit::SourceNumberEdit(Window* parent,
5959
}, true);
6060

6161
num_field = new NumberEdit(
62-
this, {0, 0, NUM_EDIT_W, 0}, vmin, vmax,
62+
this, {0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, 0}, vmin, vmax,
6363
[=]() {
6464
SourceNumVal v;
6565
v.rawValue = getValue();
@@ -73,7 +73,7 @@ SourceNumberEdit::SourceNumberEdit(Window* parent,
7373
num_field->setDefault(vdefault);
7474

7575
// The Source button
76-
m_srcBtn = new TextButton(this, {NUM_EDIT_W + PAD_TINY, 0, SRC_BTN_W, 0}, "SRC", [=]() {
76+
m_srcBtn = new TextButton(this, {EdgeTxStyles::EDIT_FLD_WIDTH_NARROW + PAD_TINY, 0, SRC_BTN_W, 0}, "SRC", [=]() {
7777
switchSourceMode();
7878
return isSource();
7979
});

‎radio/src/gui/colorlcd/controls/source_numberedit.h

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class SourceNumberEdit : public Window
4545

4646
void update();
4747

48-
static LAYOUT_VAL(NUM_EDIT_W, 84, 84, LS(84))
4948
static LAYOUT_VAL(SRC_BTN_W, 38, 38, LS(38))
5049

5150
protected:

‎radio/src/gui/colorlcd/libui/bitmapbuffer_draw_extra.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void BitmapBuffer::drawGPSPosition(coord_t x, coord_t y, int32_t longitude,
167167
{
168168
if (flags & PREC1) {
169169
drawGPSCoord(x, y, latitude, "NS", flags, true);
170-
drawGPSCoord(x, y + EdgeTxStyles::PAGE_LINE_HEIGHT, longitude, "EW", flags, true);
170+
drawGPSCoord(x, y + EdgeTxStyles::STD_FONT_HEIGHT, longitude, "EW", flags, true);
171171
} else {
172172
if (flags & RIGHT) {
173173
x = drawGPSCoord(x, y, longitude, "EW", flags, true);
@@ -194,7 +194,7 @@ void BitmapBuffer::drawDate(coord_t x, coord_t y, TelemetryItem &telemetryItem,
194194
x = drawText(x, y, s.c_str(), att);
195195

196196
if (doTwoLines) {
197-
y += EdgeTxStyles::PAGE_LINE_HEIGHT;
197+
y += EdgeTxStyles::STD_FONT_HEIGHT;
198198
x = ox;
199199
} else {
200200
x += 11;

‎radio/src/gui/colorlcd/libui/dialog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class DynamicMessageDialog : public BaseDialog
9797
DynamicMessageDialog(const char* title,
9898
std::function<std::string()> textHandler,
9999
const char* message = "",
100-
const int lineHeight = EdgeTxStyles::PAGE_LINE_HEIGHT,
100+
const int lineHeight = EdgeTxStyles::STD_FONT_HEIGHT,
101101
LcdColorIndex color = COLOR_THEME_PRIMARY1_INDEX, LcdFlags textFlags = CENTERED);
102102
// Attn.: FONT(XXL) is not supported by DynamicMessageDialog
103103

‎radio/src/gui/colorlcd/libui/etx_lv_theme.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,20 @@ const lv_style_const_prop_t pad_large_props[] = {
129129
LV_STYLE_CONST_MULTI_INIT(EdgeTxStyles::pad_large, pad_large_props);
130130

131131
const lv_style_const_prop_t pad_button_props[] = {
132-
LV_STYLE_CONST_PAD_TOP(2),
133-
LV_STYLE_CONST_PAD_BOTTOM(2),
132+
LV_STYLE_CONST_PAD_TOP(PAD_TINY),
133+
LV_STYLE_CONST_PAD_BOTTOM(PAD_TINY),
134134
LV_STYLE_CONST_PAD_LEFT(PAD_MEDIUM),
135135
LV_STYLE_CONST_PAD_RIGHT(PAD_MEDIUM),
136-
LV_STYLE_CONST_PAD_ROW(2),
137-
LV_STYLE_CONST_PAD_COLUMN(2),
136+
LV_STYLE_CONST_PAD_ROW(PAD_TINY),
137+
LV_STYLE_CONST_PAD_COLUMN(PAD_TINY),
138138
LV_STYLE_PROP_INV,
139139
};
140140
LV_STYLE_CONST_MULTI_INIT(EdgeTxStyles::pad_button, pad_button_props);
141141

142142
const lv_style_const_prop_t pad_textarea_props[] = {
143143
LV_STYLE_CONST_PAD_TOP(PAD_SMALL),
144144
LV_STYLE_CONST_PAD_BOTTOM(PAD_SMALL - 1),
145-
LV_STYLE_CONST_PAD_LEFT(PAD_SMALL),
145+
LV_STYLE_CONST_PAD_LEFT(PAD_MEDIUM),
146146
LV_STYLE_CONST_PAD_RIGHT(PAD_SMALL),
147147
LV_STYLE_PROP_INV,
148148
};

‎radio/src/gui/colorlcd/libui/etx_lv_theme.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,11 @@ class EdgeTxStyles
277277
void init();
278278
void applyColors();
279279

280-
static LAYOUT_VAL(PAGE_LINE_HEIGHT, 20, 20, LS(20))
280+
static LAYOUT_VAL(STD_FONT_HEIGHT, 21, 21, 14)
281281
static LAYOUT_VAL(UI_ELEMENT_HEIGHT, 32, 32, 24)
282282
static LAYOUT_VAL(MENU_HEADER_HEIGHT, 45, 45, LS(45))
283+
static LAYOUT_VAL(EDIT_FLD_WIDTH_NARROW, 70, 70, LS(70))
284+
static LAYOUT_VAL(EDIT_FLD_WIDTH, 100, 100, LS(100))
283285

284286
protected:
285287
bool initDone = false;

‎radio/src/gui/colorlcd/libui/file_carosell.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ FileCarosell::FileCarosell(Window *parent, const rect_t &rect,
3535
{
3636
setWindowFlag(NO_FOCUS);
3737

38-
message = new StaticText(this, {0, rect.h/2, rect.w, EdgeTxStyles::PAGE_LINE_HEIGHT * 2}, "", COLOR_THEME_PRIMARY1_INDEX, CENTERED | FONT(L));
38+
message = new StaticText(this, {0, rect.h/2, rect.w, EdgeTxStyles::STD_FONT_HEIGHT * 2}, "", COLOR_THEME_PRIMARY1_INDEX, CENTERED | FONT(L));
3939

4040
setFileNames(fileNames);
4141
}

‎radio/src/gui/colorlcd/libui/list_line_button.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class ListLineButton : public ButtonBase
3737

3838
virtual void refresh() = 0;
3939

40-
static LAYOUT_VAL(BTN_H, 29, 29, LS(29))
40+
static constexpr coord_t BTN_H = EdgeTxStyles::STD_FONT_HEIGHT + PAD_BORDER * 2 + PAD_TINY * 2;
4141
static constexpr coord_t GRP_W = LCD_W - PAD_SMALL * 2;
4242

4343
protected:

‎radio/src/gui/colorlcd/libui/numberedit.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ NumberEdit::NumberEdit(Window* parent, const rect_t& rect, int vmin, int vmax,
214214
vmin(vmin),
215215
vmax(vmax)
216216
{
217-
if (rect.w == 0) setWidth(DEF_W);
217+
if (rect.w == 0) setWidth(EdgeTxStyles::EDIT_FLD_WIDTH);
218218

219219
setTextFlag(textFlags);
220220

‎radio/src/gui/colorlcd/libui/numberedit.h

-2
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ class NumberEdit : public TextButton
9191

9292
int32_t getValue() const { return _getValue != nullptr ? _getValue() : 0; }
9393

94-
static LAYOUT_VAL(DEF_W, 100, 100, LS(100))
95-
9694
protected:
9795
friend class NumberArea;
9896

‎radio/src/gui/colorlcd/libui/page.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ PageHeader::PageHeader(Window* parent, EdgeTxIcon icon) :
3636

3737
title = new StaticText(this,
3838
{PAGE_TITLE_LEFT, PAGE_TITLE_TOP,
39-
LCD_W - PAGE_TITLE_LEFT, EdgeTxStyles::PAGE_LINE_HEIGHT},
39+
LCD_W - PAGE_TITLE_LEFT, EdgeTxStyles::STD_FONT_HEIGHT},
4040
"", COLOR_THEME_PRIMARY2_INDEX);
4141
}
4242

@@ -51,16 +51,16 @@ PageHeader::PageHeader(Window* parent, const char* iconFile) :
5151

5252
title = new StaticText(this,
5353
{PAGE_TITLE_LEFT, PAGE_TITLE_TOP,
54-
LCD_W - PAGE_TITLE_LEFT, EdgeTxStyles::PAGE_LINE_HEIGHT},
54+
LCD_W - PAGE_TITLE_LEFT, EdgeTxStyles::STD_FONT_HEIGHT},
5555
"", COLOR_THEME_PRIMARY2_INDEX);
5656
}
5757

5858
StaticText* PageHeader::setTitle2(std::string txt)
5959
{
6060
if (title2 == nullptr) {
6161
title2 = new StaticText(this,
62-
{PAGE_TITLE_LEFT, PAGE_TITLE_TOP + EdgeTxStyles::PAGE_LINE_HEIGHT,
63-
LCD_W - PAGE_TITLE_LEFT, EdgeTxStyles::PAGE_LINE_HEIGHT},
62+
{PAGE_TITLE_LEFT, PAGE_TITLE_TOP + EdgeTxStyles::STD_FONT_HEIGHT,
63+
LCD_W - PAGE_TITLE_LEFT, EdgeTxStyles::STD_FONT_HEIGHT},
6464
"", COLOR_THEME_PRIMARY2_INDEX);
6565
}
6666
title2->setText(std::move(txt));

‎radio/src/gui/colorlcd/libui/textedit.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ TextEdit::TextEdit(Window* parent, const rect_t& rect, char* text,
123123
}),
124124
updateHandler(updateHandler), text(text), length(length)
125125
{
126-
if (rect.w == 0) setWidth(DEF_W);
126+
if (rect.w == 0) setWidth(EdgeTxStyles::EDIT_FLD_WIDTH);
127127

128128
update();
129129
lv_obj_align(label, LV_ALIGN_OUT_LEFT_MID, 0, PAD_TINY);

‎radio/src/gui/colorlcd/libui/textedit.h

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ class TextEdit : public TextButton
3636
void preview(bool edited, char* text, uint8_t length);
3737
void update();
3838

39-
static LAYOUT_VAL(DEF_W, 100, 100, 70)
40-
4139
protected:
4240
std::function<void(void)> updateHandler = nullptr;
4341
TextArea* edit = nullptr;

‎radio/src/gui/colorlcd/libui/window.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ SetupButtonGroup::SetupButtonGroup(Window* parent, const rect_t& rect, const cha
474474
int rows = (pages.size() + cols - 1) / cols;
475475
int height = rows * btnHeight + (rows - 1) * PAD_MEDIUM + PAD_TINY * 2;
476476
if (title) {
477-
height += EdgeTxStyles::PAGE_LINE_HEIGHT + PAD_TINY;
477+
height += EdgeTxStyles::STD_FONT_HEIGHT + PAD_TINY;
478478
}
479479
setHeight(height);
480480

@@ -483,7 +483,7 @@ SetupButtonGroup::SetupButtonGroup(Window* parent, const rect_t& rect, const cha
483483

484484
int n = 0;
485485
int remaining = pages.size();
486-
coord_t yo = title ? EdgeTxStyles::PAGE_LINE_HEIGHT + PAD_TINY : 0;
486+
coord_t yo = title ? EdgeTxStyles::STD_FONT_HEIGHT + PAD_TINY : 0;
487487
coord_t xw = buttonWidth + PAD_SMALL;
488488
coord_t xo = (width() - (cols * xw - PAD_SMALL)) / 2;
489489
coord_t x, y;
@@ -520,7 +520,7 @@ SetupLine::SetupLine(Window* parent, coord_t y, coord_t col2, PaddingSize paddin
520520
{
521521
padAll(PAD_ZERO);
522522
coord_t titleY = PAD_LARGE + lblYOffset;
523-
coord_t titleH = EdgeTxStyles::PAGE_LINE_HEIGHT;
523+
coord_t titleH = EdgeTxStyles::STD_FONT_HEIGHT;
524524
coord_t h = EdgeTxStyles::UI_ELEMENT_HEIGHT + PAD_TINY * 2 + lblYOffset * 2;
525525
if (createEdit) {
526526
coord_t editY = PAD_TINY;

‎radio/src/gui/colorlcd/mainview/widget_settings.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ WidgetSettings::WidgetSettings(Widget* w) :
6464
switch (opt->type) {
6565
case ZoneOption::Integer:
6666
(new NumberEdit(
67-
line, rect_t{0, 0, 96, 0}, opt->min.signedValue,
67+
line, rect_t{}, opt->min.signedValue,
6868
opt->max.signedValue,
6969
[=]() -> int {
7070
return optVal->signedValue;
@@ -102,7 +102,7 @@ WidgetSettings::WidgetSettings(Widget* w) :
102102
break;
103103

104104
case ZoneOption::String:
105-
new ModelTextEdit(line, rect_t{0, 0, 96, 0},
105+
new ModelTextEdit(line, rect_t{},
106106
optVal->stringValue,
107107
sizeof(optVal->stringValue));
108108
break;

‎radio/src/gui/colorlcd/model/curveedit.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ void CurveEditWindow::buildBody(Window* window)
305305

306306
// Smooth
307307
auto smooth =
308-
new TextButton(iLine, rect_t{0, 0, NUMEDT_W, 0}, STR_SMOOTH, [=]() {
308+
new TextButton(iLine, rect_t{0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, 0}, STR_SMOOTH, [=]() {
309309
g_model.curves[index].smooth = !g_model.curves[index].smooth;
310310
curveEdit->updatePreview();
311311
return g_model.curves[index].smooth;
@@ -320,7 +320,7 @@ void CurveEditWindow::buildBody(Window* window)
320320
// Type
321321
new StaticText(iLine, rect_t{}, STR_TYPE);
322322
new Choice(
323-
iLine, {0, 0, TextEdit::DEF_W, 0}, STR_CURVE_TYPES, 0, 1,
323+
iLine, {0, 0, EdgeTxStyles::EDIT_FLD_WIDTH, 0}, STR_CURVE_TYPES, 0, 1,
324324
GET_DEFAULT(g_model.curves[index].type), [=](int32_t newValue) {
325325
CurveHeader& curve = g_model.curves[index];
326326
if (newValue != curve.type) {
@@ -346,7 +346,7 @@ void CurveEditWindow::buildBody(Window* window)
346346

347347
// Points count
348348
auto edit = new Choice(
349-
iLine, {0, 0, NUMEDT_W, 0}, 2, 17,
349+
iLine, {0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, 0}, 2, 17,
350350
GET_DEFAULT(g_model.curves[index].points + 5), [=](int32_t newValue) {
351351
newValue -= 5;
352352
CurveHeader& curve = g_model.curves[index];

‎radio/src/gui/colorlcd/model/curveedit.h

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class CurveEditWindow : public Page
3737

3838
void setCurrentSource(mixsrc_t source);
3939

40-
static LAYOUT_VAL(NUMEDT_W, 70, 70, LS(70))
4140
static LAYOUT_VAL(CURVE_WIDTH, 215, 232, LS(215))
4241

4342
protected:

0 commit comments

Comments
 (0)