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

Black. flake8, pylint, and clang-format fixes

Browse Source
This commit is contained in:
Michael Davidson 2023-12-26 13:07:37 +11:00
parent 631a969107
commit 93432b85b9
No known key found for this signature in database
GPG Key ID: B8D1A99712B8B0EB
9 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,9 @@ display::Rect DisplayRenderingPanel::measure_item_internal(display::Display *dis
return display::Rect(0, 0, this->width_, this->height_);
}
void DisplayRenderingPanel::render_internal(display::Display *display, display::Rect bounds) { this->lambda_(*display); }
void DisplayRenderingPanel::render_internal(display::Display *display, display::Rect bounds) {
this->lambda_(*display);
}
} // namespace graphical_layout
} // namespace esphome

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

@ -1,6 +1,6 @@
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome.const import CONF_ID, CONF_WIDTH, CONF_HEIGHT, CONF_LAMBDA
from esphome.const import CONF_WIDTH, CONF_HEIGHT, CONF_LAMBDA
from esphome.components.display import DisplayRef
graphical_layout_ns = cg.esphome_ns.namespace("graphical_layout")

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

@ -11,7 +11,7 @@ static const char *const TAG = "horizontalstack";
void HorizontalStack::dump_config(int indent_depth, int additional_level_depth) {
ESP_LOGCONFIG(TAG, "%*sItem Padding: %i", indent_depth, "", this->item_padding_);
ESP_LOGCONFIG(TAG, "%*sChild alignment: %i", indent_depth, "", (int)this->child_align_);
ESP_LOGCONFIG(TAG, "%*sChild alignment: %i", indent_depth, "", (int) this->child_align_);
ESP_LOGCONFIG(TAG, "%*sChildren: %i", indent_depth, "", this->children_.size());
for (LayoutItem *child : this->children_) {

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

@ -1,6 +1,6 @@
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome.const import CONF_ID, CONF_TYPE
from esphome.const import CONF_TYPE
graphical_layout_ns = cg.esphome_ns.namespace("graphical_layout")
HorizontalStack = graphical_layout_ns.class_("HorizontalStack")

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

@ -39,7 +39,7 @@ void LayoutItem::render(display::Display *display, display::Rect bounds) {
}
// Padding
display->set_local_coordinates_relative_to_current(this->border_ + this->padding_, this->border_ + this->padding_);
display->set_local_coordinates_relative_to_current(this->border_ + this->padding_, this->border_ + this->padding_);
int margin_border_padding_offset = (this->margin_ + this->border_ + this->padding_) * 2;
display::Rect internal_bounds(0, 0, bounds.w - margin_border_padding_offset, bounds.h - margin_border_padding_offset);

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

@ -53,7 +53,7 @@ class LayoutItem {
/** Measures the internal size of the item this should only be the portion drawn exclusive
* of any padding or margins
*
*
* param[in] display: Display that will be used for rendering. May be used to help with calculations
*/
virtual display::Rect measure_item_internal(display::Display *display) = 0;
@ -69,7 +69,7 @@ class LayoutItem {
/** Performs the rendering of the item internals of the item exclusive of any padding or margins
* (or rather, after they've already been handled by render)
*
*
* param[in] display: Display to render to
* param[in] bounds: Size of the area drawing should be constrained to
*/

1
esphome/components/graphical_layout/text_panel.py
View File

@ -1,7 +1,6 @@
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome.components import font, color
from esphome.const import CONF_ID
graphical_layout_ns = cg.esphome_ns.namespace("graphical_layout")
TextPanel = graphical_layout_ns.class_("TextPanel")

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

@ -11,7 +11,7 @@ static const char *const TAG = "verticalstack";
void VerticalStack::dump_config(int indent_depth, int additional_level_depth) {
ESP_LOGCONFIG(TAG, "%*sItem Padding: %i", indent_depth, "", this->item_padding_);
ESP_LOGCONFIG(TAG, "%*sChild alignment: %i", indent_depth, "", (int)this->child_align_);
ESP_LOGCONFIG(TAG, "%*sChild alignment: %i", indent_depth, "", (int) this->child_align_);
ESP_LOGCONFIG(TAG, "%*sChildren: %i", indent_depth, "", this->children_.size());
for (LayoutItem *child : this->children_) {

3
esphome/components/graphical_layout/vertical_stack.py
View File

@ -1,6 +1,6 @@
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome.const import CONF_ID, CONF_TYPE
from esphome.const import CONF_TYPE
graphical_layout_ns = cg.esphome_ns.namespace("graphical_layout")
VerticalStack = graphical_layout_ns.class_("VerticalStack")
@ -18,6 +18,7 @@ HORIZONTAL_CHILD_ALIGN = {
"STRETCH_TO_FIT_WIDTH": HorizontalChildAlign.STRETCH_TO_FIT_WIDTH,
}
def get_config_schema(base_item_schema, item_type_schema):
return base_item_schema.extend(
{