From a88cacb71e8810a196541c490d38f2463f29e1b8 Mon Sep 17 00:00:00 2001 From: Brian Pugh Date: Sun, 23 Jun 2019 16:21:03 -0700 Subject: [PATCH] Restore LV_TXT_LINE_BREAK_LONG_* defines in lv_conf_template.h and checker --- lv_conf_template.h | 10 ++++++++++ src/lv_conf_checker.h | 15 +++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/lv_conf_template.h b/lv_conf_template.h index 2560a586f..935a65962 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -290,6 +290,16 @@ typedef void * lv_font_user_data_t; /*Can break (wrap) texts on these chars*/ #define LV_TXT_BREAK_CHARS " ,.;:-_" +/* If a character is at least this long, will break wherever "prettiest" */ +#define LV_TXT_LINE_BREAK_LONG_LEN 12 + +/* Minimum number of characters of a word to put on a line before a break */ +#define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN 3 + +/* Minimum number of characters of a word to put on a line after a break */ +#define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3 + + /*=================== * LV_OBJ SETTINGS *==================*/ diff --git a/src/lv_conf_checker.h b/src/lv_conf_checker.h index d8274e258..afa9dab50 100644 --- a/src/lv_conf_checker.h +++ b/src/lv_conf_checker.h @@ -405,6 +405,21 @@ #define LV_TXT_BREAK_CHARS " ,.;:-_" #endif +/* If a character is at least this long, will break wherever "prettiest" */ +#ifndef LV_TXT_LINE_BREAK_LONG_LEN +#define LV_TXT_LINE_BREAK_LONG_LEN 12 +#endif + +/* Minimum number of characters of a word to put on a line before a break */ +#ifndef LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN +#define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN 3 +#endif + +/* Minimum number of characters of a word to put on a line after a break */ +#ifndef LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN +#define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3 +#endif + /*=================== * LV_OBJ SETTINGS *==================*/