Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

icon stuff (actually a failed SVG experiment) #129

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ if get_option('front-lvgl').enabled()

lvgl_proj = cmake.subproject('lvgl', options: cmake_options)
lvgl_dep = lvgl_proj.dependency('lvgl')
lvgl_thorvg_dep = lvgl_proj.dependency('lvgl_thorvg')

quickjs_options = cmake.subproject_options()
quickjs_options.add_cmake_defines({'BUILD_QJS_LIBC': true})
Expand Down Expand Up @@ -242,6 +243,7 @@ if get_option('front-lvgl').enabled()
thread_dep,
curl_dep,
lvgl_dep,
lvgl_thorvg_dep,
sdl2_dep,
openssl_dep,
zlib_dep,
Expand All @@ -255,4 +257,27 @@ if get_option('front-lvgl').enabled()
lvgl_backend_define,
],
)

executable(
'test-lvgl',
[
'src/test-lvgl.cpp',
'src/logger.cpp',
font_b612_c,
version_file,
],
install: false,
dependencies: [
thread_dep,
lvgl_dep,
lvgl_thorvg_dep,
sdl2_dep,
libatomic,
],
include_directories: incdir,
cpp_args: [
'-DLV_CONF_PATH=' + meson.current_build_dir() + '/../src/lv_conf.h',
lvgl_backend_define,
],
)
endif
2 changes: 1 addition & 1 deletion src/front-lvgl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void uithread(int _argc, char* _argv[])
lv_style_set_text_font(&B612style, B612font);

/* container for object row (top 80% of screen) and logs (bottom 20%) */
lv_obj_t* row_and_logs = lv_obj_create(lv_scr_act());
lv_obj_t* row_and_logs = lv_obj_create(lv_screen_active());
lv_obj_remove_style_all(row_and_logs);
lv_obj_remove_flag(row_and_logs, LV_OBJ_FLAG_SCROLLABLE);
lv_obj_set_size(row_and_logs, MY_DISP_HOR_RES, MY_DISP_VER_RES);
Expand Down
22 changes: 11 additions & 11 deletions src/lv_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
* - LV_LOG_LEVEL_ERROR Log only critical issues, when system may fail.
* - LV_LOG_LEVEL_USER Log only custom log messages added by the user.
* - LV_LOG_LEVEL_NONE Do not log anything. */
#define LV_LOG_LEVEL LV_LOG_LEVEL_WARN
#define LV_LOG_LEVEL LV_LOG_LEVEL_TRACE

/** - 1: Print log with 'printf';
* - 0: User needs to register a callback with `lv_log_register_print_cb()`. */
Expand All @@ -347,9 +347,9 @@
#define LV_LOG_USE_FILE_LINE 1

/* Enable/disable LV_LOG_TRACE in modules that produces a huge number of logs. */
#define LV_LOG_TRACE_MEM 1 /**< Enable/disable trace logs in memory operations. */
#define LV_LOG_TRACE_TIMER 1 /**< Enable/disable trace logs in timer operations. */
#define LV_LOG_TRACE_INDEV 1 /**< Enable/disable trace logs in input device operations. */
#define LV_LOG_TRACE_MEM 0 /**< Enable/disable trace logs in memory operations. */
#define LV_LOG_TRACE_TIMER 0 /**< Enable/disable trace logs in timer operations. */
#define LV_LOG_TRACE_INDEV 0 /**< Enable/disable trace logs in input device operations. */
#define LV_LOG_TRACE_DISP_REFR 1 /**< Enable/disable trace logs in display re-draw operations. */
#define LV_LOG_TRACE_EVENT 1 /**< Enable/disable trace logs in event dispatch logic. */
#define LV_LOG_TRACE_OBJ_CREATE 1 /**< Enable/disable trace logs in object creation (core `obj` creation plus every widget). */
Expand Down Expand Up @@ -511,11 +511,11 @@
#define LV_ATTRIBUTE_EXTERN_DATA

/** Use `float` as `lv_value_precise_t` */
#define LV_USE_FLOAT 0
#define LV_USE_FLOAT 1

/** Enable matrix support
* - Requires `LV_USE_FLOAT = 1` */
#define LV_USE_MATRIX 0
#define LV_USE_MATRIX 1

/** Include `lvgl_private.h` in `lvgl.h` to access internal data and functions by default */
#define LV_USE_PRIVATE_API 0
Expand Down Expand Up @@ -695,7 +695,7 @@

#define LV_USE_LIST 1

#define LV_USE_LOTTIE 0 /**< Requires: lv_canvas, thorvg */
#define LV_USE_LOTTIE 1 /**< Requires: lv_canvas, thorvg */

#define LV_USE_MENU 1

Expand Down Expand Up @@ -893,10 +893,10 @@

/** Enable Vector Graphic APIs
* - Requires `LV_USE_MATRIX = 1` */
#define LV_USE_VECTOR_GRAPHIC 0
#define LV_USE_VECTOR_GRAPHIC 1

/** Enable ThorVG (vector graphics library) from the src/libs folder */
#define LV_USE_THORVG_INTERNAL 0
#define LV_USE_THORVG_INTERNAL 1

/** Enable ThorVG by assuming that its installed and linked to the project */
#define LV_USE_THORVG_EXTERNAL 0
Expand All @@ -908,9 +908,9 @@
#define LV_USE_LZ4_EXTERNAL 0

/*SVG library*/
#define LV_USE_SVG 0
#define LV_USE_SVG 1
#define LV_USE_SVG_ANIMATION 0
#define LV_USE_SVG_DEBUG 0
#define LV_USE_SVG_DEBUG 1

/** FFmpeg library for image decoding and playing videos.
* Supports all major image formats so do not enable other image decoder with it. */
Expand Down
Loading
Loading