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

Apply ci-custom and clang-format fixes

Browse source
This commit is contained in:
Michael Davidson 2024-01-06 11:40:36 +11:00
parent b49453ef7e
commit 65825516d4
No known key found for this signature in database
GPG key ID: B8D1A99712B8B0EB
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,7 +94,8 @@ std::vector<std::shared_ptr<CalculatedTextRun>> TextRunPanel::split_runs_into_wo
return runs; return runs;
} }
std::vector<std::shared_ptr<LineInfo>> TextRunPanel::fit_words_to_bounds(const std::vector<std::shared_ptr<CalculatedTextRun>> &runs, display::Rect bounds) { std::vector<std::shared_ptr<LineInfo>> TextRunPanel::fit_words_to_bounds(
const std::vector<std::shared_ptr<CalculatedTextRun>> &runs, display::Rect bounds) {
int x_offset = 0; int x_offset = 0;
int y_offset = 0; int y_offset = 0;
int current_line_number = 0; int current_line_number = 0;
@ -119,7 +120,7 @@ std::vector<std::shared_ptr<LineInfo>> TextRunPanel::fit_words_to_bounds(const s
// Fits on the line // Fits on the line
run->bounds.x = x_offset; run->bounds.x = x_offset;
run->bounds.y = y_offset; run->bounds.y = y_offset;
current_line->add_run(run); current_line->add_run(run);
x_offset += run->bounds.w; x_offset += run->bounds.w;
@ -128,7 +129,8 @@ std::vector<std::shared_ptr<LineInfo>> TextRunPanel::fit_words_to_bounds(const s
return lines; return lines;
} }
void TextRunPanel::apply_alignment_to_lines(std::vector<std::shared_ptr<LineInfo>> &lines, display::TextAlign alignment) { void TextRunPanel::apply_alignment_to_lines(std::vector<std::shared_ptr<LineInfo>> &lines,
display::TextAlign alignment) {
const auto x_align = display::TextAlign(int(this->text_align_) & TEXT_ALIGN_X_MASK); const auto x_align = display::TextAlign(int(this->text_align_) & TEXT_ALIGN_X_MASK);
const auto y_align = display::TextAlign(int(this->text_align_) & TEXT_ALIGN_Y_MASK); const auto y_align = display::TextAlign(int(this->text_align_) & TEXT_ALIGN_Y_MASK);
@ -149,7 +151,7 @@ void TextRunPanel::apply_alignment_to_lines(std::vector<std::shared_ptr<LineInfo
switch (x_align) { switch (x_align) {
case display::TextAlign::RIGHT: { case display::TextAlign::RIGHT: {
x_adjustment = max_line_width - line->total_width; x_adjustment = max_line_width - line->total_width;
break; break;
} }
case display::TextAlign::CENTER_HORIZONTAL: { case display::TextAlign::CENTER_HORIZONTAL: {
x_adjustment = (max_line_width - line->total_width) / 2; x_adjustment = (max_line_width - line->total_width) / 2;
@ -207,8 +209,9 @@ CalculatedLayout TextRunPanel::determine_layout(display::Display *display, displ
layout.bounds.w = std::max(layout.bounds.w, line->total_width); layout.bounds.w = std::max(layout.bounds.w, line->total_width);
} }
layout.bounds.h = y_offset; layout.bounds.h = y_offset;
ESP_LOGD(TAG, "Text fits on %i lines and its bounds are (%i, %i)", layout.line_count, layout.bounds.w, layout.bounds.h); ESP_LOGD(TAG, "Text fits on %i lines and its bounds are (%i, %i)", layout.line_count, layout.bounds.w,
layout.bounds.h);
return layout; return layout;
} }