...

3 files changed, 46 insertions, 60 deletions

diff --git a/src/ui/cursor.cpp b/src/ui/cursor.cpp
index 91b94b16..d8c362ed 100644
--- a/src/ui/cursor.cpp
+++ b/src/ui/cursor.cpp
@@ -2,31 +2,23 @@
 
 #include "exception.hpp"
 
-namespace cru::ui
-{
-    Cursor::Cursor(HCURSOR handle, const bool auto_release)
-        : handle_(handle), auto_release_(auto_release)
-    {
+namespace cru::ui {
+Cursor::Cursor(HCURSOR handle, const bool auto_release)
+    : handle_(handle), auto_release_(auto_release) {}
 
-    }
-
-    Cursor::~Cursor()
-    {
-        if (auto_release_)
-            ::DestroyCursor(handle_);
-    }
+Cursor::~Cursor() {
+  if (auto_release_) ::DestroyCursor(handle_);
+}
 
-    namespace cursors
-    {
-        Cursor::Ptr arrow{};
-        Cursor::Ptr hand{};
-        Cursor::Ptr i_beam{};
+namespace cursors {
+Cursor::Ptr arrow{};
+Cursor::Ptr hand{};
+Cursor::Ptr i_beam{};
 
-        void LoadSystemCursors()
-        {
-            arrow = std::make_shared<Cursor>(::LoadCursorW(nullptr, IDC_ARROW), false);
-            hand = std::make_shared<Cursor>(::LoadCursorW(nullptr, IDC_HAND), false);
-            i_beam = std::make_shared<Cursor>(::LoadCursorW(nullptr, IDC_IBEAM), false);
-        }
-    }
+void LoadSystemCursors() {
+  arrow = std::make_shared<Cursor>(::LoadCursorW(nullptr, IDC_ARROW), false);
+  hand = std::make_shared<Cursor>(::LoadCursorW(nullptr, IDC_HAND), false);
+  i_beam = std::make_shared<Cursor>(::LoadCursorW(nullptr, IDC_IBEAM), false);
 }
+}  // namespace cursors
+}  // namespace cru::ui
diff --git a/src/ui/cursor.hpp b/src/ui/cursor.hpp
index 273e524d..aec3fc40 100644
--- a/src/ui/cursor.hpp
+++ b/src/ui/cursor.hpp
@@ -3,41 +3,35 @@
 // ReSharper disable once CppUnusedIncludeDirective
 #include "pre.hpp"
 
-#include "system_headers.hpp"
 #include <memory>
+#include "system_headers.hpp"
 
 #include "base.hpp"
 
-namespace cru::ui
-{
-    class Cursor : public Object
-    {
-    public:
-        using Ptr = std::shared_ptr<Cursor>;
-
-        Cursor(HCURSOR handle, bool auto_release);
-        Cursor(const Cursor& other) = delete;
-        Cursor(Cursor&& other) = delete;
-        Cursor& operator=(const Cursor& other) = delete;
-        Cursor& operator=(Cursor&& other) = delete;
-        ~Cursor() override;
-
-        HCURSOR GetHandle() const
-        {
-            return handle_;
-        }
-
-    private:
-        HCURSOR handle_;
-        bool auto_release_;
-    };
-
-    namespace cursors
-    {
-        extern Cursor::Ptr arrow;
-        extern Cursor::Ptr hand;
-        extern Cursor::Ptr i_beam;
-
-        void LoadSystemCursors();
-    }
-}
+namespace cru::ui {
+class Cursor : public Object {
+ public:
+  using Ptr = std::shared_ptr<Cursor>;
+
+  Cursor(HCURSOR handle, bool auto_release);
+  Cursor(const Cursor& other) = delete;
+  Cursor(Cursor&& other) = delete;
+  Cursor& operator=(const Cursor& other) = delete;
+  Cursor& operator=(Cursor&& other) = delete;
+  ~Cursor() override;
+
+  HCURSOR GetHandle() const { return handle_; }
+
+ private:
+  HCURSOR handle_;
+  bool auto_release_;
+};
+
+namespace cursors {
+extern Cursor::Ptr arrow;
+extern Cursor::Ptr hand;
+extern Cursor::Ptr i_beam;
+
+void LoadSystemCursors();
+}  // namespace cursors
+}  // namespace cru::ui
diff --git a/src/ui/render/flex_layout_render_object.cpp b/src/ui/render/flex_layout_render_object.cpp
index 7891906d..5383c462 100644
--- a/src/ui/render/flex_layout_render_object.cpp
+++ b/src/ui/render/flex_layout_render_object.cpp
@@ -8,8 +8,8 @@
 
 namespace cru::ui::render {
 FlexChildLayoutData* FlexLayoutRenderObject::GetChildLayoutData(int position) {
-  if (position < 0 || position >= child_layout_data_.size())
-    throw std::invalid_argument("Position out of bound.");
+  assert(position >= 0 &&
+         position < child_layout_data_.size());  // Position out of bound.
 
   return &child_layout_data_[position];
 }