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

feat(color): add 4x2 and 6x1 main view layouts (#6660)

Browse Source
This commit is contained in:
Guilhem23
2025-10-19 13:07:47 +10:00
committed by GitHub
parent fe919c0b31
commit 79774e216f
2 changed files with 219 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/layouts/layout4x2.cpp
+119
View File
@@ -0,0 +1,119 @@
/*
* Copyright (C) EdgeTX
*
* Based on code named
* opentx - https://github.com/opentx/opentx
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include "layout.h"
#include "layout_factory_impl.h"
// 4x2 layout: 4 rows, 2 columns
// Suitable for portrait screens and vertical screen usage
const ZoneOption OPTIONS_LAYOUT_4x2[] = {
LAYOUT_COMMON_OPTIONS,
{"Panel1 background", ZoneOption::Bool, OPTION_VALUE_BOOL(true)},
{" Color", ZoneOption::Color, RGB2FLAGS(77, 112, 203)},
{"Panel2 background", ZoneOption::Bool, OPTION_VALUE_BOOL(true)},
{" Color", ZoneOption::Color, RGB2FLAGS(77, 112, 203)},
LAYOUT_OPTIONS_END};
class Layout4x2 : public Layout
{
public:
enum {
OPTION_PANEL1_BACKGROUND = LAYOUT_OPTION_LAST_DEFAULT + 1,
OPTION_PANEL1_COLOR,
OPTION_PANEL2_BACKGROUND,
OPTION_PANEL2_COLOR
};
Layout4x2(Window* parent, const LayoutFactory* factory,
Layout::PersistentData* persistentData, uint8_t zoneCount,
uint8_t* zoneMap) :
Layout(parent, factory, persistentData, zoneCount, zoneMap)
{
panel1 = lv_obj_create(lvobj);
lv_obj_set_style_bg_opa(panel1, LV_OPA_COVER, LV_PART_MAIN);
panel2 = lv_obj_create(lvobj);
lv_obj_set_style_bg_opa(panel2, LV_OPA_COVER, LV_PART_MAIN);
setPanels();
}
protected:
rect_t mainZone = {0, 0, 0, 0};
lv_obj_t* panel1 = nullptr;
lv_obj_t* panel2 = nullptr;
void checkEvents() override
{
setPanels();
Layout::checkEvents();
}
void setPanels()
{
rect_t zone = Layout::getMainZone();
if (mainZone.x != zone.x || mainZone.y != zone.y || mainZone.w != zone.w ||
mainZone.h != zone.h) {
mainZone = zone;
// Left column panel
lv_obj_set_pos(panel1, mainZone.x, mainZone.y);
lv_obj_set_size(panel1, mainZone.w / 2, mainZone.h);
// Right column panel
lv_obj_set_pos(panel2, mainZone.x + mainZone.w / 2, mainZone.y);
lv_obj_set_size(panel2, mainZone.w / 2, mainZone.h);
}
bool vis = getOptionValue(OPTION_PANEL1_BACKGROUND)->boolValue;
if (vis == lv_obj_has_flag(panel1, LV_OBJ_FLAG_HIDDEN)) {
if (vis)
lv_obj_clear_flag(panel1, LV_OBJ_FLAG_HIDDEN);
else
lv_obj_add_flag(panel1, LV_OBJ_FLAG_HIDDEN);
}
vis = getOptionValue(OPTION_PANEL2_BACKGROUND)->boolValue;
if (vis == lv_obj_has_flag(panel2, LV_OBJ_FLAG_HIDDEN)) {
if (vis)
lv_obj_clear_flag(panel2, LV_OBJ_FLAG_HIDDEN);
else
lv_obj_add_flag(panel2, LV_OBJ_FLAG_HIDDEN);
}
etx_bg_color_from_flags(panel1, getOptionValue(OPTION_PANEL1_COLOR)->unsignedValue);
etx_bg_color_from_flags(panel2, getOptionValue(OPTION_PANEL2_COLOR)->unsignedValue);
}
};
// Zone map: 4x2 (4 rows, 2 columns)
// Each zone is 1/4 height, 1/2 width
static const uint8_t zmap[] = {
// Zone positions: x, y, w, h (using LAYOUT_MAP constants)
LAYOUT_MAP_0, LAYOUT_MAP_0, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, // Top-left
LAYOUT_MAP_HALF, LAYOUT_MAP_0, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, // Top-right
LAYOUT_MAP_0, LAYOUT_MAP_1QTR, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, // 2nd row left
LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, // 2nd row right
LAYOUT_MAP_0, LAYOUT_MAP_HALF, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, // 3rd row left
LAYOUT_MAP_HALF, LAYOUT_MAP_HALF, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, // 3rd row right
LAYOUT_MAP_0, LAYOUT_MAP_3QTR, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, // Bottom-left
LAYOUT_MAP_HALF, LAYOUT_MAP_3QTR, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, // Bottom-right
};
BaseLayoutFactory<Layout4x2> layout4x2("Layout4x2", "4 x 2",
OPTIONS_LAYOUT_4x2,
8, (uint8_t*)zmap);
radio/src/gui/colorlcd/layouts/layout6x1.cpp
+100
View File
@@ -0,0 +1,100 @@
/*
* Copyright (C) EdgeTX
*
* Based on code named
* opentx - https://github.com/opentx/opentx
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include "layout.h"
#include "layout_factory_impl.h"
// 6x1 layout: 6 rows, 1 column
// Single column with 6 vertical zones
const ZoneOption OPTIONS_LAYOUT_6x1[] = {
LAYOUT_COMMON_OPTIONS,
{"Background", ZoneOption::Bool, OPTION_VALUE_BOOL(true)},
{" Color", ZoneOption::Color, RGB2FLAGS(50, 50, 50)},
LAYOUT_OPTIONS_END};
class Layout6x1 : public Layout
{
public:
enum {
OPTION_BACKGROUND = LAYOUT_OPTION_LAST_DEFAULT + 1,
OPTION_COLOR
};
Layout6x1(Window* parent, const LayoutFactory* factory,
Layout::PersistentData* persistentData, uint8_t zoneCount,
uint8_t* zoneMap) :
Layout(parent, factory, persistentData, zoneCount, zoneMap)
{
panel = lv_obj_create(lvobj);
lv_obj_set_style_bg_opa(panel, LV_OPA_COVER, LV_PART_MAIN);
setPanel();
}
protected:
rect_t mainZone = {0, 0, 0, 0};
lv_obj_t* panel = nullptr;
void checkEvents() override
{
setPanel();
Layout::checkEvents();
}
void setPanel()
{
rect_t zone = Layout::getMainZone();
if (mainZone.x != zone.x || mainZone.y != zone.y || mainZone.w != zone.w ||
mainZone.h != zone.h) {
mainZone = zone;
lv_obj_set_pos(panel, mainZone.x, mainZone.y);
lv_obj_set_size(panel, mainZone.w, mainZone.h);
}
bool vis = getOptionValue(OPTION_BACKGROUND)->boolValue;
if (vis == lv_obj_has_flag(panel, LV_OBJ_FLAG_HIDDEN)) {
if (vis)
lv_obj_clear_flag(panel, LV_OBJ_FLAG_HIDDEN);
else
lv_obj_add_flag(panel, LV_OBJ_FLAG_HIDDEN);
}
etx_bg_color_from_flags(panel, getOptionValue(OPTION_COLOR)->unsignedValue);
}
};
// Zone map: 6x1 (6 rows, 1 column)
// Each zone is 1/6 height, full width
#define LAYOUT_MAP_1_6TH 10 // 1/6 of full dimension (60/6 = 10)
static const uint8_t zmap[] = {
// Zone positions: x, y, w, h
LAYOUT_MAP_0, LAYOUT_MAP_0, LAYOUT_MAP_FULL, LAYOUT_MAP_1_6TH, // Zone 1
LAYOUT_MAP_0, LAYOUT_MAP_1_6TH, LAYOUT_MAP_FULL, LAYOUT_MAP_1_6TH, // Zone 2
LAYOUT_MAP_0, LAYOUT_MAP_1_6TH*2,LAYOUT_MAP_FULL, LAYOUT_MAP_1_6TH, // Zone 3
LAYOUT_MAP_0, LAYOUT_MAP_1_6TH*3,LAYOUT_MAP_FULL, LAYOUT_MAP_1_6TH, // Zone 4
LAYOUT_MAP_0, LAYOUT_MAP_1_6TH*4,LAYOUT_MAP_FULL, LAYOUT_MAP_1_6TH, // Zone 5
LAYOUT_MAP_0, LAYOUT_MAP_1_6TH*5,LAYOUT_MAP_FULL, LAYOUT_MAP_1_6TH, // Zone 6
};
BaseLayoutFactory<Layout6x1> layout6x1("Layout6x1", "6 x 1",
OPTIONS_LAYOUT_6x1,
6, (uint8_t*)zmap);