diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
| commit | ada2c09581d2d13acfa5ce9a97671c0ec17863f1 (patch) | |
| tree | 2f776adc59d0c63e403d2043cb8460e65d6c46fe /src/libs/lv_conf.h | |
| parent | 18cff286c75f432095db4b188e0f9a8a9e2bd8e8 (diff) | |
| parent | c9a5c3fa5c930a5939d3114a6c6b48570d61ca24 (diff) | |
Merge branch 'develop' into infineat-external-resources
# Conflicts:
# src/displayapp/screens/Symbols.h
# src/displayapp/screens/settings/SettingWatchFace.cpp
# src/displayapp/screens/settings/SettingWatchFace.h
Diffstat (limited to 'src/libs/lv_conf.h')
| -rw-r--r-- | src/libs/lv_conf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index 73109c5a..00f6a1df 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -161,7 +161,7 @@ typedef void* lv_anim_user_data_t; #define LV_USE_OUTLINE 0 /*1: enable pattern drawing on rectangles*/ -#define LV_USE_PATTERN 0 +#define LV_USE_PATTERN 1 /*1: enable value string drawing on rectangles*/ #define LV_USE_VALUE_STR 1 @@ -678,7 +678,7 @@ typedef void* lv_obj_user_data_t; #endif /*Mask (dependencies: -)*/ -#define LV_USE_OBJMASK 0 +#define LV_USE_OBJMASK 1 /*Message box (dependencies: lv_rect, lv_btnm, lv_label)*/ #define LV_USE_MSGBOX 0 |