Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-12 08:24:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Introduce ParagraphBreakTextRun. Forcefully causes new paragraphs

Browse source
This commit is contained in:
Michael Davidson 2024-01-28 16:35:46 +11:00
parent c46adb2c73
commit 6880bc99ff
No known key found for this signature in database
GPG key ID: B8D1A99712B8B0EB
3 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
esphome/components/graphical_layout/text_run_panel.cpp
View file

@ -97,7 +97,9 @@ std::vector<std::shared_ptr<CalculatedTextRun>> TextRunPanel::split_runs_into_wo
can_wrap_at_args.offset = i; can_wrap_at_args.offset = i;
prop.can_wrap = this->can_wrap_at_character_.value(can_wrap_at_args); prop.can_wrap = this->can_wrap_at_character_.value(can_wrap_at_args);
if ((current_text_run == nullptr) || (!current_text_run->run_properties.is_equivalent(prop))) { // New lines always trigger a new run regardless of equivalency with prior runs
if ((current_text_run == nullptr) || (!current_text_run->run_properties.is_equivalent(prop)) ||
(prop.causes_new_line)) {
current_text_run = std::make_shared<CalculatedTextRun>(run, prop); current_text_run = std::make_shared<CalculatedTextRun>(run, prop);
runs.push_back(current_text_run); runs.push_back(current_text_run);
} }

12
esphome/components/graphical_layout/text_run_panel.h
View file

@ -71,6 +71,18 @@ class TextRun : public TextRunBase, public FormattableTextRun {
TemplatableValue<std::string> text_{}; TemplatableValue<std::string> text_{};
}; };
class ParagraphBreakTextRun : public TextRunBase {
public:
ParagraphBreakTextRun(size_t breaks, display::BaseFont *font) : TextRunBase(font) {
this->text_.append(breaks, '\n');
}
std::string get_text() override { return this->text_; }
protected:
std::string text_{""};
};
class SensorTextRun : public TextRunBase, public FormattableTextRun { class SensorTextRun : public TextRunBase, public FormattableTextRun {
public: public:
SensorTextRun(sensor::Sensor *sensor, display::BaseFont *font) : TextRunBase(font) { this->sensor_ = sensor; } SensorTextRun(sensor::Sensor *sensor, display::BaseFont *font) : TextRunBase(font) { this->sensor_ = sensor; }

14
esphome/components/graphical_layout/text_run_panel.py
View file

@ -18,6 +18,7 @@ TextRun = graphical_layout_ns.class_("TextRun", TextRunBase)
SensorTextRun = graphical_layout_ns.class_("SensorTextRun", TextRunBase) SensorTextRun = graphical_layout_ns.class_("SensorTextRun", TextRunBase)
TextSensorTextRun = graphical_layout_ns.class_("TextSensorTextRun", TextRunBase) TextSensorTextRun = graphical_layout_ns.class_("TextSensorTextRun", TextRunBase)
TimeTextRun = graphical_layout_ns.class_("TimeTextRun", TextRunBase) TimeTextRun = graphical_layout_ns.class_("TimeTextRun", TextRunBase)
ParagraphBreakTextRun = graphical_layout_ns.class_("ParagraphBreakTextRun", TextRunBase)
CanWrapAtCharacterArguments = graphical_layout_ns.struct("CanWrapAtCharacterArguments") CanWrapAtCharacterArguments = graphical_layout_ns.struct("CanWrapAtCharacterArguments")
CanWrapAtCharacterArgumentsConstRef = CanWrapAtCharacterArguments.operator( CanWrapAtCharacterArgumentsConstRef = CanWrapAtCharacterArguments.operator(
"const" "const"
@ -37,6 +38,7 @@ CONF_TEXT_FORMATTER = "text_formatter"
CONF_TIME_FORMAT = "time_format" CONF_TIME_FORMAT = "time_format"
CONF_USE_UTC_TIME = "use_utc_time" CONF_USE_UTC_TIME = "use_utc_time"
CONF_DRAW_PARTIAL_LINES = "draw_partial_lines" CONF_DRAW_PARTIAL_LINES = "draw_partial_lines"
CONF_PARAGRAPH_BREAK = "paragraph_break"
TEXT_ALIGN = { TEXT_ALIGN = {
"TOP_LEFT": TextAlign.TOP_LEFT, "TOP_LEFT": TextAlign.TOP_LEFT,
@ -95,11 +97,19 @@ TIME_TEXT_RUN_SCHEMA = BASE_RUN_SCHEMA.extend(
} }
) )
PARAGRAPH_BREAK_TEXT_RUN_SCHEMA = BASE_RUN_SCHEMA.extend(
{
cv.GenerateID(): cv.declare_id(ParagraphBreakTextRun),
cv.Optional(CONF_PARAGRAPH_BREAK, default=1): cv.int_range(min=1),
}
)
RUN_SCHEMA = cv.Any( RUN_SCHEMA = cv.Any(
SENSOR_TEXT_RUN_SCHEMA, SENSOR_TEXT_RUN_SCHEMA,
TEXT_RUN_SCHEMA, TEXT_RUN_SCHEMA,
TEXT_SENSOR_TEXT_RUN_SCHEMA, TEXT_SENSOR_TEXT_RUN_SCHEMA,
TIME_TEXT_RUN_SCHEMA, TIME_TEXT_RUN_SCHEMA,
PARAGRAPH_BREAK_TEXT_RUN_SCHEMA,
) )
@ -165,6 +175,10 @@ async def config_to_layout_item(pvariable_builder, item_config, child_item_build
run = cg.new_Pvariable( run = cg.new_Pvariable(
run_config[CONF_ID], time_sens, time_format, use_utc_time, run_font run_config[CONF_ID], time_sens, time_format, use_utc_time, run_font
) )
elif paragraph_break_config := run_config.get(CONF_PARAGRAPH_BREAK):
run = cg.new_Pvariable(
run_config[CONF_ID], paragraph_break_config, run_font
)
else: else:
run_text = await cg.templatable( run_text = await cg.templatable(
run_config[CONF_TEXT], args=[], output_type=cg.std_string run_config[CONF_TEXT], args=[], output_type=cg.std_string