From 255d851125b5eae97d66e5d0239c0e4c2502f4c1 Mon Sep 17 00:00:00 2001
From: Michael Davidson <mr.m.davidson@gmail.com>
Date: Tue, 26 Dec 2023 13:12:02 +1100
Subject: [PATCH] Additional clang-format and ci-custom fixes

---
 esphome/components/graphical_layout/__init__.py     | 3 +--
 esphome/components/graphical_layout/layout_item.cpp | 1 -
 esphome/components/graphical_layout/layout_item.h   | 6 +++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/esphome/components/graphical_layout/__init__.py b/esphome/components/graphical_layout/__init__.py
index d07725bfc9..56664f30a3 100644
--- a/esphome/components/graphical_layout/__init__.py
+++ b/esphome/components/graphical_layout/__init__.py
@@ -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_ID, CONF_TYPE, CONF_BORDER
 from esphome.components import color
 from . import horizontal_stack
 from . import vertical_stack
@@ -21,7 +21,6 @@ MULTI_CONF = True
 CONF_LAYOUT = "layout"
 CONF_MARGIN = "margin"
 CONF_PADDING = "padding"
-CONF_BORDER = "border"
 CONF_BORDER_COLOR = "border_color"
 
 BASE_ITEM_SCHEMA = cv.Schema(
diff --git a/esphome/components/graphical_layout/layout_item.cpp b/esphome/components/graphical_layout/layout_item.cpp
index a43205e2ae..3d44302b05 100644
--- a/esphome/components/graphical_layout/layout_item.cpp
+++ b/esphome/components/graphical_layout/layout_item.cpp
@@ -55,6 +55,5 @@ void LayoutItem::render(display::Display *display, display::Rect bounds) {
   display->pop_local_coordinates();
 }
 
-
 }  // namespace graphical_layout
 }  // namespace esphome
diff --git a/esphome/components/graphical_layout/layout_item.h b/esphome/components/graphical_layout/layout_item.h
index ab1636f0ec..d6c62f76ca 100644
--- a/esphome/components/graphical_layout/layout_item.h
+++ b/esphome/components/graphical_layout/layout_item.h
@@ -55,7 +55,7 @@ class LayoutItem {
    * 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;
 
   /** 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] bounds: Size of the area drawing should be constrained to
-  */
+   */
   virtual void render_internal(display::Display *display, display::Rect bounds) = 0;
 
   /** Dump the items config to aid the user
-   * 
+   *
    * param[in] indent_depth: Depth to indent the config
    * param[in] additional_level_depth: If children require their config to be dumped you increment
    *  their indent_depth before calling it