Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-01-07 05:11:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Test, clang-format, and ci-custom fixes

Browse source
This commit is contained in:
Michael Davidson 2023-12-30 11:07:47 +11:00
parent 38ac72c912
commit 5f47c6e255
No known key found for this signature in database
GPG key ID: B8D1A99712B8B0EB
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ display::Rect TextRunPanel::measure_item_internal(display::Display *display) {
void TextRunPanel::render_internal(display::Display *display, display::Rect bounds) { void TextRunPanel::render_internal(display::Display *display, display::Rect bounds) {
CalculatedLayout layout = this->determine_layout(display, bounds, true); CalculatedLayout layout = this->determine_layout(display, bounds, true);
for (const auto& calculated : layout.runs) { for (const auto &calculated : layout.runs) {
if (calculated->run->background_color_ != display::COLOR_OFF) { if (calculated->run->background_color_ != display::COLOR_OFF) {
display->filled_rectangle(calculated->bounds.x, calculated->bounds.y, calculated->bounds.w, calculated->bounds.h, display->filled_rectangle(calculated->bounds.x, calculated->bounds.y, calculated->bounds.w, calculated->bounds.h,
calculated->run->background_color_); calculated->run->background_color_);
@ -52,7 +52,7 @@ void TextRunPanel::render_internal(display::Display *display, display::Rect boun
if (this->debug_outline_runs_) { if (this->debug_outline_runs_) {
ESP_LOGD(TAG, "Outlining character runs"); ESP_LOGD(TAG, "Outlining character runs");
for (const auto& calculated : layout.runs) { for (const auto &calculated : layout.runs) {
display->rectangle(calculated->bounds.x, calculated->bounds.y, calculated->bounds.w, calculated->bounds.h); display->rectangle(calculated->bounds.x, calculated->bounds.y, calculated->bounds.w, calculated->bounds.h);
} }
} }
@ -185,7 +185,7 @@ void TextRunPanel::apply_alignment_to_layout(CalculatedLayout *calculated_layout
std::vector<std::shared_ptr<CalculatedTextRun>> line_runs; std::vector<std::shared_ptr<CalculatedTextRun>> line_runs;
// Get all the runs for the current line // Get all the runs for the current line
for (const auto& run : calculated_layout->runs) { for (const auto &run : calculated_layout->runs) {
if (run->line_number_ == i) { if (run->line_number_ == i) {
line_runs.push_back(run); line_runs.push_back(run);
} }
@ -224,7 +224,7 @@ void TextRunPanel::apply_alignment_to_layout(CalculatedLayout *calculated_layout
} }
int max_line_y_adjustment = 0; int max_line_y_adjustment = 0;
for (const auto& run : line_runs) { for (const auto &run : line_runs) {
ESP_LOGVV(TAG, "Adjusting '%s' from (%i, %i) to (%i, %i)", run->text_.c_str(), run->bounds.x, run->bounds.y, ESP_LOGVV(TAG, "Adjusting '%s' from (%i, %i) to (%i, %i)", run->text_.c_str(), run->bounds.x, run->bounds.y,
run->bounds.x + x_adjustment, run->bounds.y + y_adjustment); run->bounds.x + x_adjustment, run->bounds.y + y_adjustment);
run->bounds.x += x_adjustment; run->bounds.x += x_adjustment;

5
tests/test1.yaml
View file

@ -4351,7 +4351,8 @@ graphical_layout:
lambda: |- lambda: |-
it.filled_circle(25, 25, 10); it.filled_circle(25, 25, 10);
- type: text_run_panel - type: text_run_panel
texT_align: BASELINE_CENTER text_align: BASELINE_CENTER
max_width: 100
runs: runs:
- font: roboto - font: roboto
text: Hello text: Hello
@ -4361,4 +4362,4 @@ graphical_layout:
foreground_color: layout_white foreground_color: layout_white
- font: roboto - font: roboto
text: !lambda |- text: !lambda |-
return "Dynamic text"; return "Dynamic text";