fix(ui): Tweak mixer overview layout for long names (#2851)
* Fix Mixer layout on color lcd screen to accommodate long input names. * Adjust layout for portrait orientation.
This commit is contained in:
@@ -34,9 +34,9 @@ STATIC_LZ4_BITMAP(mask_textline_fm);
|
|||||||
|
|
||||||
#if LCD_W > LCD_H // Landscape
|
#if LCD_W > LCD_H // Landscape
|
||||||
static const lv_coord_t col_dsc[] = {
|
static const lv_coord_t col_dsc[] = {
|
||||||
LV_GRID_FR(1), // weigth
|
LV_GRID_FR(7), // weight
|
||||||
LV_GRID_FR(1), // source
|
LV_GRID_FR(12), // source
|
||||||
LV_GRID_FR(4), // opts
|
LV_GRID_FR(29), // opts
|
||||||
FM_CANVAS_WIDTH, // flight modes
|
FM_CANVAS_WIDTH, // flight modes
|
||||||
LV_GRID_TEMPLATE_LAST
|
LV_GRID_TEMPLATE_LAST
|
||||||
};
|
};
|
||||||
@@ -45,9 +45,9 @@ static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT,
|
|||||||
LV_GRID_TEMPLATE_LAST};
|
LV_GRID_TEMPLATE_LAST};
|
||||||
#else // Portrait
|
#else // Portrait
|
||||||
static const lv_coord_t col_dsc[] = {
|
static const lv_coord_t col_dsc[] = {
|
||||||
LV_GRID_FR(1), // weigth
|
LV_GRID_FR(13), // weight
|
||||||
LV_GRID_FR(1), // source
|
LV_GRID_FR(21), // source
|
||||||
LV_GRID_FR(2), // opts
|
LV_GRID_FR(32), // opts
|
||||||
LV_GRID_TEMPLATE_LAST
|
LV_GRID_TEMPLATE_LAST
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -56,8 +56,6 @@ static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT,
|
|||||||
LV_GRID_TEMPLATE_LAST};
|
LV_GRID_TEMPLATE_LAST};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static const char _empty_txt[] = "";
|
|
||||||
|
|
||||||
InputMixButton::InputMixButton(Window* parent, uint8_t index) :
|
InputMixButton::InputMixButton(Window* parent, uint8_t index) :
|
||||||
ListLineButton(parent, index)
|
ListLineButton(parent, index)
|
||||||
{
|
{
|
||||||
@@ -65,7 +63,7 @@ InputMixButton::InputMixButton(Window* parent, uint8_t index) :
|
|||||||
lv_obj_set_grid_dsc_array(lvobj, col_dsc, row_dsc);
|
lv_obj_set_grid_dsc_array(lvobj, col_dsc, row_dsc);
|
||||||
|
|
||||||
weight = lv_label_create(lvobj);
|
weight = lv_label_create(lvobj);
|
||||||
lv_obj_set_grid_cell(weight, LV_GRID_ALIGN_END, 0, 1, LV_GRID_ALIGN_START, 0, 1);
|
lv_obj_set_grid_cell(weight, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 0, 1);
|
||||||
|
|
||||||
source = lv_label_create(lvobj);
|
source = lv_label_create(lvobj);
|
||||||
lv_obj_set_grid_cell(source, LV_GRID_ALIGN_START, 1, 1, LV_GRID_ALIGN_START, 0, 1);
|
lv_obj_set_grid_cell(source, LV_GRID_ALIGN_START, 1, 1, LV_GRID_ALIGN_START, 0, 1);
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
static const lv_coord_t col_dsc[] = {
|
static const lv_coord_t col_dsc[] = {
|
||||||
lv_coord_t(LV_DPI_DEF * 0.65), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST,
|
lv_coord_t(LV_DPI_DEF * 0.55), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const lv_coord_t row_dsc[] = {
|
static const lv_coord_t row_dsc[] = {
|
||||||
|
|||||||
Reference in New Issue
Block a user