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

Additional clang-format and ci-custom fixes

Browse source
This commit is contained in:
Michael Davidson 2023-12-26 13:12:02 +11:00
parent 93432b85b9
commit 255d851125
No known key found for this signature in database
GPG key ID: B8D1A99712B8B0EB
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
esphome/components/graphical_layout/__init__.py
View file

@ -1,6 +1,6 @@
import esphome.codegen as cg import esphome.codegen as cg
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import CONF_ID, CONF_TYPE from esphome.const import CONF_ID, CONF_TYPE, CONF_BORDER
from esphome.components import color from esphome.components import color
from . import horizontal_stack from . import horizontal_stack
from . import vertical_stack from . import vertical_stack
@ -21,7 +21,6 @@ MULTI_CONF = True
CONF_LAYOUT = "layout" CONF_LAYOUT = "layout"
CONF_MARGIN = "margin" CONF_MARGIN = "margin"
CONF_PADDING = "padding" CONF_PADDING = "padding"
CONF_BORDER = "border"
CONF_BORDER_COLOR = "border_color" CONF_BORDER_COLOR = "border_color"
BASE_ITEM_SCHEMA = cv.Schema( BASE_ITEM_SCHEMA = cv.Schema(

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

@ -55,6 +55,5 @@ void LayoutItem::render(display::Display *display, display::Rect bounds) {
display->pop_local_coordinates(); display->pop_local_coordinates();
} }
} // namespace graphical_layout } // namespace graphical_layout
} // namespace esphome } // namespace esphome

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

@ -55,7 +55,7 @@ class LayoutItem {
* of any padding or margins * of any padding or margins
* *
* 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 display::Rect measure_item_internal(display::Display *display) = 0; virtual display::Rect measure_item_internal(display::Display *display) = 0;
/** Perform the rendering of the item to the display accounting for the margin and padding of the /** Perform the rendering of the item to the display accounting for the margin and padding of the
@ -72,11 +72,11 @@ class LayoutItem {
* *
* param[in] display: Display to render to * param[in] display: Display to render to
* param[in] bounds: Size of the area drawing should be constrained to * param[in] bounds: Size of the area drawing should be constrained to
*/ */
virtual void render_internal(display::Display *display, display::Rect bounds) = 0; virtual void render_internal(display::Display *display, display::Rect bounds) = 0;
/** Dump the items config to aid the user /** Dump the items config to aid the user
* *
* param[in] indent_depth: Depth to indent the config * param[in] indent_depth: Depth to indent the config
* param[in] additional_level_depth: If children require their config to be dumped you increment * param[in] additional_level_depth: If children require their config to be dumped you increment
* their indent_depth before calling it * their indent_depth before calling it