From 5f341149fa1e5af35100d22ba9b1f9e2872600e8 Mon Sep 17 00:00:00 2001
From: Andrea Blankenstijn <a.b@kaze.ch>
Date: Tue, 24 Aug 2021 00:12:57 +0200
Subject: [PATCH] clang-format header sorting conf fix. Some spacing and order
 of include/declaration changes.

---
 .clang-format                              |  4 ++--
 inc/basic_widgets/core/type/color.hpp      |  3 ++-
 inc/basic_widgets/w/base/input_impl.hpp    | 10 +++++-----
 inc/basic_widgets/w/feat/event_handler.hpp |  1 +
 src/w/button_impl.cpp                      |  1 +
 src/w/caption_impl.cpp                     |  1 +
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.clang-format b/.clang-format
index 80b5f17..c773cb2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -34,14 +34,14 @@ EmptyLineBeforeAccessModifier: Always
 FixNamespaceComments: false
 IncludeBlocks: Regroup
 IncludeCategories:
-    - Regex: '<[[:alnum:]._]+>'
-      Priority: -10
     - Regex: '^<fontconfig'
       Priority: -5
     - Regex: '^<SDL'
       Priority: -5
     - Regex: '^<basic_widgets/'
       Priority: 0
+    - Regex: '<[[:alnum:]._]+>'
+      Priority: -10
     - Regex: '^".*"$'
       Priority: 5
 IndentCaseLabels: true
diff --git a/inc/basic_widgets/core/type/color.hpp b/inc/basic_widgets/core/type/color.hpp
index 04e63b7..5f700ec 100644
--- a/inc/basic_widgets/core/type/color.hpp
+++ b/inc/basic_widgets/core/type/color.hpp
@@ -3,9 +3,10 @@
 
 #include <cmath>
 #include <functional>
-#include <SDL_pixels.h>
 #include <stdexcept>
 
+#include <SDL_pixels.h>
+
 #include <basic_widgets/core/type/concepts.hpp>
 
 namespace bwidgets
diff --git a/inc/basic_widgets/w/base/input_impl.hpp b/inc/basic_widgets/w/base/input_impl.hpp
index 00bc44e..7df1d63 100644
--- a/inc/basic_widgets/w/base/input_impl.hpp
+++ b/inc/basic_widgets/w/base/input_impl.hpp
@@ -23,11 +23,6 @@ namespace bwidgets
                       public virtual WidgetImpl
     {
     public:
-        void color_fg(const Color c) override
-        {
-            _input_caption->font_color_fg(c);
-        }
-
         [[nodiscard]] auto input_text() const -> std::string_view override
         {
             return _input_caption->text();
@@ -38,6 +33,11 @@ namespace bwidgets
             _input_caption->text(std::move(txt));
         }
 
+        void input_text_color(const Color c) override
+        {
+            _input_caption->font_color_fg(c);
+        }
+
         [[nodiscard]] auto is_valid_input(const std::string_view) const noexcept
           -> bool override
         {
diff --git a/inc/basic_widgets/w/feat/event_handler.hpp b/inc/basic_widgets/w/feat/event_handler.hpp
index ef1d612..1cf7228 100644
--- a/inc/basic_widgets/w/feat/event_handler.hpp
+++ b/inc/basic_widgets/w/feat/event_handler.hpp
@@ -2,6 +2,7 @@
 #define BWIDGETS_EVENT_HANDLER_HPP
 
 #include <functional>
+
 #include <SDL_events.h>
 
 namespace bwidgets
diff --git a/src/w/button_impl.cpp b/src/w/button_impl.cpp
index 28ccc46..558e38f 100644
--- a/src/w/button_impl.cpp
+++ b/src/w/button_impl.cpp
@@ -56,6 +56,7 @@ void ButtonImpl::_handle_geometry_change(const SDL_Rect& vp)
     const auto txt_size = _caption->size();
     _caption_area       = {center_line(vp.w, txt_size.w), center_line(vp.h, txt_size.h),
                      txt_size.w, txt_size.h};
+
     _caption->viewport(rect_offset(_caption_area, vp));
 }
 
diff --git a/src/w/caption_impl.cpp b/src/w/caption_impl.cpp
index d51b147..28232de 100644
--- a/src/w/caption_impl.cpp
+++ b/src/w/caption_impl.cpp
@@ -22,6 +22,7 @@ void CaptionImpl::render_mode(const Font::RenderMode m)
 auto CaptionImpl::size() const noexcept -> Size
 {
     if (!_font) return {0, 0};
+
     const auto [w, h] = _font->text_size(_text);
     return {w + 2 * margins.w, h + 2 * margins.h};
 }