Use own LVGL theme
And stop using default theme
This commit is contained in:
committed by
Raphael Coeffic
parent
79619dbb06
commit
cbdc9ad8a8
@@ -2,7 +2,6 @@ include_directories(
|
|||||||
${RADIO_SRC_DIR}/gui/colorlcd
|
${RADIO_SRC_DIR}/gui/colorlcd
|
||||||
${RADIO_SRC_DIR}/gui/colorlcd/layouts
|
${RADIO_SRC_DIR}/gui/colorlcd/layouts
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/fonts
|
${CMAKE_CURRENT_BINARY_DIR}/fonts
|
||||||
# ${RADIO_SRC_DIR}/fonts/lvgl
|
|
||||||
${RADIO_SRC_DIR}/thirdparty/libopenui/src
|
${RADIO_SRC_DIR}/thirdparty/libopenui/src
|
||||||
${RADIO_SRC_DIR}/thirdparty/libopenui/thirdparty
|
${RADIO_SRC_DIR}/thirdparty/libopenui/thirdparty
|
||||||
)
|
)
|
||||||
@@ -46,9 +45,7 @@ set(GUI_SRC
|
|||||||
${THEMES_SRC}
|
${THEMES_SRC}
|
||||||
${LAYOUTS_SRC}
|
${LAYOUTS_SRC}
|
||||||
${WIDGETS_SRC}
|
${WIDGETS_SRC}
|
||||||
# popups.cpp
|
|
||||||
draw_functions.cpp
|
draw_functions.cpp
|
||||||
# menus.cpp
|
|
||||||
menu_model.cpp
|
menu_model.cpp
|
||||||
model_select.cpp
|
model_select.cpp
|
||||||
bind_menu_d16.cpp
|
bind_menu_d16.cpp
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
#include "opentx.h"
|
#include "opentx.h"
|
||||||
|
|
||||||
#include "LvglWrapper.h"
|
#include "LvglWrapper.h"
|
||||||
|
#include "themes/etx_lv_theme.h"
|
||||||
#include "view_main.h"
|
#include "view_main.h"
|
||||||
|
|
||||||
LvglWrapper* LvglWrapper::_instance = nullptr;
|
LvglWrapper* LvglWrapper::_instance = nullptr;
|
||||||
@@ -195,10 +196,6 @@ static void init_lvgl_drivers()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// The theme code needs to go somewhere else (gui/colorlcd/themes/default.cpp?)
|
// The theme code needs to go somewhere else (gui/colorlcd/themes/default.cpp?)
|
||||||
static lv_style_t generic_style;
|
|
||||||
static lv_style_t btn_style;
|
|
||||||
static lv_style_t btn_checked_style;
|
|
||||||
static lv_style_t btn_focused_style;
|
|
||||||
static lv_style_t menu_line_style;
|
static lv_style_t menu_line_style;
|
||||||
static lv_style_t menu_checked_style;
|
static lv_style_t menu_checked_style;
|
||||||
static lv_style_t textedit_style_main;
|
static lv_style_t textedit_style_main;
|
||||||
@@ -210,20 +207,15 @@ static lv_style_t numberedit_style_focused;
|
|||||||
static lv_style_t numberedit_style_cursor;
|
static lv_style_t numberedit_style_cursor;
|
||||||
static lv_style_t numberedit_style_cursor_edit;
|
static lv_style_t numberedit_style_cursor_edit;
|
||||||
|
|
||||||
static lv_style_t focus_key_style;
|
|
||||||
|
|
||||||
static void theme_apply_cb(lv_theme_t * th, lv_obj_t * obj)
|
static void theme_apply_cb(lv_theme_t * th, lv_obj_t * obj)
|
||||||
{
|
{
|
||||||
LV_UNUSED(th);
|
LV_UNUSED(th);
|
||||||
|
|
||||||
if (lv_obj_check_type(obj, &lv_switch_class)) {
|
if (lv_obj_check_type(obj, &lv_obj_class)) {
|
||||||
|
// lv_obj_add_style(obj, &generic_style, LV_PART_MAIN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
lv_obj_add_style(obj, &generic_style, LV_PART_MAIN);
|
|
||||||
|
|
||||||
lv_obj_add_style(obj, &focus_key_style, LV_STATE_FOCUS_KEY);
|
|
||||||
lv_obj_add_style(obj, &focus_key_style, LV_STATE_EDITED);
|
|
||||||
|
|
||||||
lv_obj_t* parent = lv_obj_get_parent(obj);
|
lv_obj_t* parent = lv_obj_get_parent(obj);
|
||||||
if (parent == NULL) {
|
if (parent == NULL) {
|
||||||
@@ -236,6 +228,7 @@ static void theme_apply_cb(lv_theme_t * th, lv_obj_t * obj)
|
|||||||
lv_obj_add_style(obj, &numberedit_style_focused, LV_PART_MAIN | LV_STATE_FOCUSED);
|
lv_obj_add_style(obj, &numberedit_style_focused, LV_PART_MAIN | LV_STATE_FOCUSED);
|
||||||
lv_obj_add_style(obj, &numberedit_style_cursor, LV_PART_CURSOR);
|
lv_obj_add_style(obj, &numberedit_style_cursor, LV_PART_CURSOR);
|
||||||
lv_obj_add_style(obj, &numberedit_style_cursor_edit, LV_PART_CURSOR | LV_STATE_EDITED);
|
lv_obj_add_style(obj, &numberedit_style_cursor_edit, LV_PART_CURSOR | LV_STATE_EDITED);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lv_obj_check_type(obj, &lv_textarea_class)) {
|
if (lv_obj_check_type(obj, &lv_textarea_class)) {
|
||||||
@@ -245,39 +238,12 @@ static void theme_apply_cb(lv_theme_t * th, lv_obj_t * obj)
|
|||||||
lv_obj_add_style(obj, &textedit_style_cursor_edit, LV_PART_CURSOR | LV_STATE_EDITED);
|
lv_obj_add_style(obj, &textedit_style_cursor_edit, LV_PART_CURSOR | LV_STATE_EDITED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lv_obj_check_type(obj, &lv_btn_class)) {
|
|
||||||
lv_obj_add_style(obj, &btn_style, 0);
|
|
||||||
lv_obj_add_style(obj, &btn_checked_style, LV_STATE_CHECKED);
|
|
||||||
lv_obj_add_style(obj, &btn_focused_style, LV_STATE_FOCUSED);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (lv_obj_check_type(obj, &lv_list_btn_class)) {
|
|
||||||
// menu items do not use the generic style
|
|
||||||
lv_obj_remove_style(obj, &generic_style, LV_PART_MAIN);
|
|
||||||
lv_obj_add_style(obj, &menu_line_style, 0);
|
|
||||||
lv_obj_add_style(obj, &menu_checked_style, LV_STATE_CHECKED);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void init_theme()
|
static void init_theme()
|
||||||
{
|
{
|
||||||
/*Initialize the styles*/
|
/*Initialize the styles*/
|
||||||
|
|
||||||
// generic focus outline style to overide default theme
|
|
||||||
lv_style_init(&focus_key_style);
|
|
||||||
lv_style_set_outline_width(&focus_key_style, 0);
|
|
||||||
lv_style_set_outline_opa(&focus_key_style, LV_OPA_0);
|
|
||||||
|
|
||||||
// Generic (applied to all)
|
|
||||||
lv_style_init(&generic_style);
|
|
||||||
lv_style_set_pad_all(&generic_style, 0);
|
|
||||||
lv_style_set_bg_opa(&generic_style, LV_OPA_TRANSP);
|
|
||||||
lv_style_set_border_width(&generic_style, 0);
|
|
||||||
lv_style_set_radius(&generic_style, 0);
|
|
||||||
|
|
||||||
// numberedit
|
// numberedit
|
||||||
// LV_PART_MAIN
|
// LV_PART_MAIN
|
||||||
lv_style_init(&numberedit_style_main);
|
lv_style_init(&numberedit_style_main);
|
||||||
@@ -330,24 +296,6 @@ static void init_theme()
|
|||||||
lv_style_set_opa(&textedit_style_cursor_edit, LV_OPA_COVER);
|
lv_style_set_opa(&textedit_style_cursor_edit, LV_OPA_COVER);
|
||||||
lv_style_set_bg_opa(&textedit_style_cursor_edit, LV_OPA_50);
|
lv_style_set_bg_opa(&textedit_style_cursor_edit, LV_OPA_50);
|
||||||
|
|
||||||
// Buttons
|
|
||||||
lv_style_init(&btn_style);
|
|
||||||
lv_style_set_bg_opa(&btn_style, LV_OPA_100);
|
|
||||||
lv_style_set_bg_color(&btn_style, makeLvColor(COLOR_THEME_SECONDARY2));
|
|
||||||
lv_style_set_border_opa(&btn_style, LV_OPA_0);
|
|
||||||
lv_style_set_border_width(&btn_style, 2);
|
|
||||||
|
|
||||||
// LV_STATE_CHECKED
|
|
||||||
lv_style_init(&btn_checked_style);
|
|
||||||
lv_style_set_bg_color(&btn_checked_style, makeLvColor(COLOR_THEME_ACTIVE));
|
|
||||||
|
|
||||||
// LV_STATE_FOCUSED
|
|
||||||
lv_style_init(&btn_focused_style);
|
|
||||||
lv_style_set_border_color(&btn_focused_style, makeLvColor(COLOR_THEME_FOCUS));
|
|
||||||
lv_style_set_text_color(&btn_focused_style, makeLvColor(COLOR_THEME_PRIMARY2));
|
|
||||||
lv_style_set_bg_color(&btn_focused_style, makeLvColor(COLOR_THEME_FOCUS));
|
|
||||||
lv_style_set_border_opa(&btn_focused_style, LV_OPA_100);
|
|
||||||
|
|
||||||
// Menus
|
// Menus
|
||||||
lv_style_init(&menu_line_style);
|
lv_style_init(&menu_line_style);
|
||||||
lv_style_set_bg_opa(&menu_line_style, LV_OPA_100);
|
lv_style_set_bg_opa(&menu_line_style, LV_OPA_100);
|
||||||
@@ -360,7 +308,9 @@ static void init_theme()
|
|||||||
lv_style_set_bg_color(&menu_checked_style, makeLvColor(COLOR_THEME_FOCUS));
|
lv_style_set_bg_color(&menu_checked_style, makeLvColor(COLOR_THEME_FOCUS));
|
||||||
|
|
||||||
/*Initialize the new theme from the current theme*/
|
/*Initialize the new theme from the current theme*/
|
||||||
lv_theme_t * th_act = lv_disp_get_theme(NULL);
|
lv_theme_t *th_act = etx_lv_theme_init(
|
||||||
|
NULL, lv_palette_main(LV_PALETTE_BLUE), lv_palette_main(LV_PALETTE_RED),
|
||||||
|
false, LV_FONT_DEFAULT);
|
||||||
static lv_theme_t th_new;
|
static lv_theme_t th_new;
|
||||||
th_new = *th_act;
|
th_new = *th_act;
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,41 @@
|
|||||||
|
/**
|
||||||
|
* @file lv_theme.h
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef ETX_LV_THEME_H
|
||||||
|
#define ETX_LV_THEME_H
|
||||||
|
|
||||||
|
/*********************
|
||||||
|
* INCLUDES
|
||||||
|
*********************/
|
||||||
|
#include <lvgl/lvgl.h>
|
||||||
|
|
||||||
|
/**********************
|
||||||
|
* GLOBAL PROTOTYPES
|
||||||
|
**********************/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize the theme
|
||||||
|
* @param color_primary the primary color of the theme
|
||||||
|
* @param color_secondary the secondary color for the theme
|
||||||
|
* @param font pointer to a font to use.
|
||||||
|
* @return a pointer to reference this theme later
|
||||||
|
*/
|
||||||
|
lv_theme_t* etx_lv_theme_init(lv_disp_t* disp, lv_color_t color_primary,
|
||||||
|
lv_color_t color_secondary, bool dark,
|
||||||
|
const lv_font_t* font);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get default theme
|
||||||
|
* @return a pointer to default theme, or NULL if this is not initialized
|
||||||
|
*/
|
||||||
|
lv_theme_t * etx_lv_theme_get(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if default theme is initialized
|
||||||
|
* @return true if default theme is initialized, false otherwise
|
||||||
|
*/
|
||||||
|
bool etx_lv_theme_is_inited(void);
|
||||||
|
|
||||||
|
#endif /*LV_THEME_H*/
|
||||||
+2
-2
@@ -583,7 +583,7 @@
|
|||||||
*----------*/
|
*----------*/
|
||||||
|
|
||||||
/*A simple, impressive and very complete theme*/
|
/*A simple, impressive and very complete theme*/
|
||||||
#define LV_USE_THEME_DEFAULT 1
|
#define LV_USE_THEME_DEFAULT 0
|
||||||
#if LV_USE_THEME_DEFAULT
|
#if LV_USE_THEME_DEFAULT
|
||||||
|
|
||||||
/*0: Light mode; 1: Dark mode*/
|
/*0: Light mode; 1: Dark mode*/
|
||||||
@@ -597,7 +597,7 @@
|
|||||||
#endif /*LV_USE_THEME_DEFAULT*/
|
#endif /*LV_USE_THEME_DEFAULT*/
|
||||||
|
|
||||||
/*A very simple theme that is a good starting point for a custom theme*/
|
/*A very simple theme that is a good starting point for a custom theme*/
|
||||||
#define LV_USE_THEME_BASIC 1
|
#define LV_USE_THEME_BASIC 0
|
||||||
|
|
||||||
/*A theme designed for monochrome displays*/
|
/*A theme designed for monochrome displays*/
|
||||||
#define LV_USE_THEME_MONO 0
|
#define LV_USE_THEME_MONO 0
|
||||||
|
|||||||
Vendored
+1
-1
Submodule radio/src/thirdparty/libopenui updated: 97bd5f22a8...d4641dadac
Reference in New Issue
Block a user