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

Use local defintions of COLOR_ON / COLOR_OFF

Browse source
This commit is contained in:
Michael Davidson 2023-12-31 12:41:37 +11:00
parent cf559ead56
commit 046065b307
No known key found for this signature in database
GPG key ID: B8D1A99712B8B0EB
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
esphome/components/graphical_layout/layout_item.cpp
View file

@ -8,6 +8,9 @@ namespace graphical_layout {
static const char *const TAG = "layoutitem"; static const char *const TAG = "layoutitem";
const Color COLOR_OFF(0, 0, 0, 0);
const Color COLOR_ON(255, 255, 255, 255);
display::Rect LayoutItem::measure_item(display::Display *display) { display::Rect LayoutItem::measure_item(display::Display *display) {
display::Rect inner_size = this->measure_item_internal(display); display::Rect inner_size = this->measure_item_internal(display);
int margin_border_padding = this->margin_ + this->border_ + this->padding_; int margin_border_padding = this->margin_ + this->border_ + this->padding_;

5
esphome/components/graphical_layout/layout_item.h
View file

@ -11,6 +11,9 @@ class Rect;
namespace graphical_layout { namespace graphical_layout {
extern const Color COLOR_ON;
extern const Color COLOR_OFF;
/* HorizontalChildAlign is used to control alignment of children horizontally */ /* HorizontalChildAlign is used to control alignment of children horizontally */
enum class HorizontalChildAlign { enum class HorizontalChildAlign {
/* Aligns all children to the left of their available width */ /* Aligns all children to the left of their available width */
@ -105,7 +108,7 @@ class LayoutItem {
int margin_{0}; int margin_{0};
int padding_{0}; int padding_{0};
int border_{0}; int border_{0};
Color border_color_{Color::BLACK}; Color border_color_{COLOR_ON};
}; };
const LogString *horizontal_child_align_to_string(HorizontalChildAlign align); const LogString *horizontal_child_align_to_string(HorizontalChildAlign align);

4
esphome/components/graphical_layout/text_panel.h
View file

@ -26,8 +26,8 @@ class TextPanel : public LayoutItem {
TemplatableValue<std::string> text_{}; TemplatableValue<std::string> text_{};
display::BaseFont *font_{nullptr}; display::BaseFont *font_{nullptr};
display::TextAlign text_align_{display::TextAlign::TOP_LEFT}; display::TextAlign text_align_{display::TextAlign::TOP_LEFT};
Color foreground_color_{display::COLOR_ON}; Color foreground_color_{COLOR_ON};
Color background_color_{display::COLOR_OFF}; Color background_color_{COLOR_OFF};
}; };
} // namespace graphical_layout } // namespace graphical_layout