Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-25 12:15:33 +01:00
Code Issues Projects Releases Wiki Activity

Clang fixes

Browse Source
This commit is contained in:
Michael Davidson 2023-12-22 20:35:37 +11:00
parent 64d34b2879
commit 447e3bdce7
No known key found for this signature in database
GPG Key ID: B8D1A99712B8B0EB
10 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/display/display.h
View File

@ -517,7 +517,7 @@ class Display : public PollingComponent {
* @param[in] x: x coordinate as the new local. Absolute to the displays underlying 0 * @param[in] x: x coordinate as the new local. Absolute to the displays underlying 0
* @param[in] y: y coordinate as the new local. Absolute to the displays underlying 0 * @param[in] y: y coordinate as the new local. Absolute to the displays underlying 0
*/ */
void set_local_coordinate(int x, int y) { this->local_coordinate_.push_back(Point(x, y)); }; void set_local_coordinate(int x, int y) { this->local_coordinate_.emplace_back(x, y); };
/** Changes the local coordinates to be to be (x_local + x_offset, y_local + y_offset) /** Changes the local coordinates to be to be (x_local + x_offset, y_local + y_offset)
* After calling a pixel drawn at (10, 20) would be drawn to the screen at * After calling a pixel drawn at (10, 20) would be drawn to the screen at

2
esphome/components/graphical_layout/display_rendering_panel.cpp
View File

@ -14,7 +14,7 @@ void DisplayRenderingPanel::dump_config(int indent_depth, int additional_level_d
ESP_LOGCONFIG(TAG, "%*sHas drawing lambda: %s", indent_depth, "", YESNO(this->lambda_ != nullptr)); ESP_LOGCONFIG(TAG, "%*sHas drawing lambda: %s", indent_depth, "", YESNO(this->lambda_ != nullptr));
} }
const display::Rect DisplayRenderingPanel::measure_item(display::Display *display) { display::Rect DisplayRenderingPanel::measure_item(display::Display *display) {
return display::Rect(0, 0, this->width_, this->width_); return display::Rect(0, 0, this->width_, this->width_);
} }

10
esphome/components/graphical_layout/display_rendering_panel.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <utility>
#include "esphome/components/graphical_layout/graphical_layout.h" #include "esphome/components/graphical_layout/graphical_layout.h"
#include "esphome/components/font/font.h" #include "esphome/components/font/font.h"
@ -14,13 +16,13 @@ using display_writer_t = std::function<void(display::Display &)>;
*/ */
class DisplayRenderingPanel : public LayoutItem { class DisplayRenderingPanel : public LayoutItem {
public: public:
const display::Rect measure_item(display::Display *display); display::Rect measure_item(display::Display *display) override;
void render(display::Display *display, display::Rect bounds); void render(display::Display *display, display::Rect bounds) override;
void dump_config(int indent_depth, int additional_level_depth); void dump_config(int indent_depth, int additional_level_depth) override;
void set_width(int width) { this->width_ = width; }; void set_width(int width) { this->width_ = width; };
void set_height(int height) { this->height_ = height; }; void set_height(int height) { this->height_ = height; };
void set_lambda(display_writer_t lambda) { this->lambda_ = lambda; }; void set_lambda(display_writer_t lambda) { this->lambda_ = std::move(lambda); };
protected: protected:
int width_{0}; int width_{0};

2
esphome/components/graphical_layout/horizontal_stack.cpp
View File

@ -18,7 +18,7 @@ void HorizontalStack::dump_config(int indent_depth, int additional_level_depth)
} }
} }
const display::Rect HorizontalStack::measure_item(display::Display *display) { display::Rect HorizontalStack::measure_item(display::Display *display) {
display::Rect rect(this->item_padding_, 0, 0, 0); display::Rect rect(this->item_padding_, 0, 0, 0);
for (LayoutItem *child : this->children_) { for (LayoutItem *child : this->children_) {

6
esphome/components/graphical_layout/horizontal_stack.h
View File

@ -11,10 +11,10 @@ namespace graphical_layout {
*/ */
class HorizontalStack : public ContainerLayoutItem { class HorizontalStack : public ContainerLayoutItem {
public: public:
const display::Rect measure_item(display::Display *display); display::Rect measure_item(display::Display *display) override;
void render(display::Display *display, display::Rect bounds); void render(display::Display *display, display::Rect bounds) override;
void dump_config(int indent_depth, int additional_level_depth) override;
void dump_config(int indent_depth, int additional_level_depth);
void set_item_padding(int item_padding) { this->item_padding_ = item_padding; }; void set_item_padding(int item_padding) { this->item_padding_ = item_padding; };
protected: protected:

2
esphome/components/graphical_layout/layout_item.h
View File

@ -15,7 +15,7 @@ class LayoutItem {
* *
* param[in] display: Display that will be used for rendering. May be used to help with calculations * param[in] display: Display that will be used for rendering. May be used to help with calculations
*/ */
virtual const display::Rect measure_item(display::Display *display) = 0; virtual display::Rect measure_item(display::Display *display) = 0;
/** Perform the rendering of the item to the display /** Perform the rendering of the item to the display
* *

2
esphome/components/graphical_layout/text_panel.cpp
View File

@ -13,7 +13,7 @@ void TextPanel::dump_config(int indent_depth, int additional_level_depth) {
ESP_LOGCONFIG(TAG, "%*sText: %s", indent_depth, "", this->text_.c_str()); ESP_LOGCONFIG(TAG, "%*sText: %s", indent_depth, "", this->text_.c_str());
} }
const display::Rect TextPanel::measure_item(display::Display *display) { display::Rect TextPanel::measure_item(display::Display *display) {
int x1; int x1;
int y1; int y1;
int width; int width;

10
esphome/components/graphical_layout/text_panel.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <utility>
#include "esphome/components/graphical_layout/graphical_layout.h" #include "esphome/components/graphical_layout/graphical_layout.h"
#include "esphome/components/font/font.h" #include "esphome/components/font/font.h"
@ -12,12 +14,12 @@ const Color COLOR_OFF(0, 0, 0, 0);
/** The TextPanel is a UI item that renders a single line of text to a display */ /** The TextPanel is a UI item that renders a single line of text to a display */
class TextPanel : public LayoutItem { class TextPanel : public LayoutItem {
public: public:
const display::Rect measure_item(display::Display *display); display::Rect measure_item(display::Display *display) override;
void render(display::Display *display, display::Rect bounds); void render(display::Display *display, display::Rect bounds) override;
void dump_config(int indent_depth, int additional_level_depth); void dump_config(int indent_depth, int additional_level_depth) override;
void set_item_padding(int item_padding) { this->item_padding_ = item_padding; }; void set_item_padding(int item_padding) { this->item_padding_ = item_padding; };
void set_text(std::string text) { this->text_ = text; }; void set_text(std::string text) { this->text_ = std::move(text); };
void set_font(display::BaseFont *font) { this->font_ = font; }; void set_font(display::BaseFont *font) { this->font_ = font; };
void set_foreground_color(Color foreground_color) { this->foreground_color_ = foreground_color; }; void set_foreground_color(Color foreground_color) { this->foreground_color_ = foreground_color; };
void set_background_color(Color background_color) { this->background_color_ = background_color; }; void set_background_color(Color background_color) { this->background_color_ = background_color; };

2
esphome/components/graphical_layout/vertical_stack.cpp
View File

@ -18,7 +18,7 @@ void VerticalStack::dump_config(int indent_depth, int additional_level_depth) {
} }
} }
const display::Rect VerticalStack::measure_item(display::Display *display) { display::Rect VerticalStack::measure_item(display::Display *display) {
display::Rect rect(0, this->item_padding_, 0, 0); display::Rect rect(0, this->item_padding_, 0, 0);
for (LayoutItem *child : this->children_) { for (LayoutItem *child : this->children_) {

6
esphome/components/graphical_layout/vertical_stack.h
View File

@ -10,10 +10,10 @@ namespace graphical_layout {
*/ */
class VerticalStack : public ContainerLayoutItem { class VerticalStack : public ContainerLayoutItem {
public: public:
const display::Rect measure_item(display::Display *display); display::Rect measure_item(display::Display *display) override;
void render(display::Display *display, display::Rect bounds); void render(display::Display *display, display::Rect bounds) override;
void dump_config(int indent_depth, int additional_level_depth) override;
void dump_config(int indent_depth, int additional_level_depth);
void set_item_padding(int item_padding) { this->item_padding_ = item_padding; }; void set_item_padding(int item_padding) { this->item_padding_ = item_padding; };
protected: protected: