8 files changed, 16 insertions, 2 deletions
diff --git a/include/cru/ui/ClickDetector.hpp b/include/cru/ui/ClickDetector.hpp
index f5fd3d8f..3977fb8e 100644
--- a/include/cru/ui/ClickDetector.hpp
+++ b/include/cru/ui/ClickDetector.hpp
@@ -1,7 +1,6 @@
 #pragma once
 #include "Control.hpp"
 
-
 namespace cru::ui {
 class ClickEventArgs : Object {
  public:
@@ -37,6 +36,8 @@ enum class ClickState {
 };
 
 class ClickDetector : public Object {
+  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::ClickDetector")
+
  public:
   explicit ClickDetector(Control* control);
 
diff --git a/include/cru/ui/UiHost.hpp b/include/cru/ui/UiHost.hpp
index 651dab81..1a5c6302 100644
--- a/include/cru/ui/UiHost.hpp
+++ b/include/cru/ui/UiHost.hpp
@@ -32,6 +32,8 @@ struct AfterLayoutEventArgs {};
 // 4. Delete Window when deleting_ is false and IsRetainAfterDestroy is false in
 // OnNativeDestroy.
 class UiHost : public Object, public SelfResolvable<UiHost> {
+  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::UiHost")
+
  public:
   // This will create root window render object and attach it to window.
   // It will also create and manage a native window.
diff --git a/include/cru/ui/render/BorderRenderObject.hpp b/include/cru/ui/render/BorderRenderObject.hpp
index db989453..94e888d4 100644
--- a/include/cru/ui/render/BorderRenderObject.hpp
+++ b/include/cru/ui/render/BorderRenderObject.hpp
@@ -3,6 +3,8 @@
 
 namespace cru::ui::render {
 class BorderRenderObject : public RenderObject {
+  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::BorderRenderObject")
+
  public:
   BorderRenderObject();
   BorderRenderObject(const BorderRenderObject& other) = delete;
diff --git a/include/cru/ui/render/FlexLayoutRenderObject.hpp b/include/cru/ui/render/FlexLayoutRenderObject.hpp
index 4b1e079d..87a41c7e 100644
--- a/include/cru/ui/render/FlexLayoutRenderObject.hpp
+++ b/include/cru/ui/render/FlexLayoutRenderObject.hpp
@@ -74,6 +74,8 @@ namespace cru::ui::render {
 // and just fill the rest space with blank.
 //
 class FlexLayoutRenderObject : public LayoutRenderObject<FlexChildLayoutData> {
+  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::FlexLayoutRenderObject")
+
  public:
   FlexLayoutRenderObject() = default;
   FlexLayoutRenderObject(const FlexLayoutRenderObject& other) = delete;
diff --git a/include/cru/ui/render/LayoutHelper.hpp b/include/cru/ui/render/LayoutHelper.hpp
index 8536c451..3469ccf0 100644
--- a/include/cru/ui/render/LayoutHelper.hpp
+++ b/include/cru/ui/render/LayoutHelper.hpp
@@ -9,5 +9,6 @@ float CalculateAnchorByAlignment(Alignment alignment, float start_point,
 
 MeasureLength StackLayoutCalculateChildMaxLength(
     MeasureLength parent_preferred_size, MeasureLength parent_max_size,
-    MeasureLength child_min_size, std::string_view exceeds_message);
+    MeasureLength child_min_size, std::string_view log_tag,
+    std::string_view exceeds_message);
 }  // namespace cru::ui::render
diff --git a/include/cru/ui/render/RenderObject.hpp b/include/cru/ui/render/RenderObject.hpp
index 2d9cd817..2e784afc 100644
--- a/include/cru/ui/render/RenderObject.hpp
+++ b/include/cru/ui/render/RenderObject.hpp
@@ -37,6 +37,8 @@ namespace cru::ui::render {
 class RenderObject : public Object {
   friend WindowRenderObject;
 
+  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::RenderObject")
+
  protected:
   enum class ChildMode {
     None,
diff --git a/include/cru/ui/render/StackLayoutRenderObject.hpp b/include/cru/ui/render/StackLayoutRenderObject.hpp
index f6b4ffb7..534d7f22 100644
--- a/include/cru/ui/render/StackLayoutRenderObject.hpp
+++ b/include/cru/ui/render/StackLayoutRenderObject.hpp
@@ -23,6 +23,8 @@ namespace cru::ui::render {
 // to min size.
 class StackLayoutRenderObject
     : public LayoutRenderObject<StackChildLayoutData> {
+  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render:StackLayoutRenderObject")
+
  public:
   StackLayoutRenderObject() = default;
   CRU_DELETE_COPY(StackLayoutRenderObject)
diff --git a/include/cru/ui/render/TextRenderObject.hpp b/include/cru/ui/render/TextRenderObject.hpp
index 26c8db40..77a92b4f 100644
--- a/include/cru/ui/render/TextRenderObject.hpp
+++ b/include/cru/ui/render/TextRenderObject.hpp
@@ -18,6 +18,8 @@ namespace cru::ui::render {
 // If the result layout box is bigger than actual text box, then text is center
 // aligned.
 class TextRenderObject : public RenderObject {
+  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::TextRenderObject")
+
  public:
   constexpr static float default_caret_width = 2;