11 files changed, 12 insertions, 10 deletions
diff --git a/include/cru/ui/controls/TextHostControlService.h b/include/cru/ui/controls/TextHostControlService.h
index 74da1e19..dec9b3e0 100644
--- a/include/cru/ui/controls/TextHostControlService.h
+++ b/include/cru/ui/controls/TextHostControlService.h
@@ -76,7 +76,7 @@ class TextControlMovePattern : public Object {
 };
 
 class CRU_UI_API TextHostControlService : public Object {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::controls::TextControlService")
+  CRU_DEFINE_CLASS_LOG_TAG(u"TextControlService")
 
  public:
   TextHostControlService(gsl::not_null<Control*> control);
diff --git a/include/cru/ui/helper/ClickDetector.h b/include/cru/ui/helper/ClickDetector.h
index 0d74b9c0..3bf28451 100644
--- a/include/cru/ui/helper/ClickDetector.h
+++ b/include/cru/ui/helper/ClickDetector.h
@@ -41,7 +41,7 @@ enum class ClickState {
 };
 
 class ClickDetector : public Object {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::ClickDetector")
+  CRU_DEFINE_CLASS_LOG_TAG(u"ClickDetector")
 
  public:
   explicit ClickDetector(controls::Control* control);
diff --git a/include/cru/ui/helper/ShortcutHub.h b/include/cru/ui/helper/ShortcutHub.h
index 84e786aa..28c41234 100644
--- a/include/cru/ui/helper/ShortcutHub.h
+++ b/include/cru/ui/helper/ShortcutHub.h
@@ -2,6 +2,7 @@
 #include "../Base.h"
 
 #include "../events/UiEvents.h"
+#include "cru/common/Base.h"
 #include "cru/common/Event.h"
 #include "cru/platform/gui/Keyboard.h"
 
@@ -97,6 +98,7 @@ struct ShortcutInfo {
 };
 
 class CRU_UI_API ShortcutHub : public Object {
+  CRU_DEFINE_CLASS_LOG_TAG(u"ShortcutHub")
  public:
   ShortcutHub() = default;
 
diff --git a/include/cru/ui/host/WindowHost.h b/include/cru/ui/host/WindowHost.h
index 9fe46ac0..b1d0c998 100644
--- a/include/cru/ui/host/WindowHost.h
+++ b/include/cru/ui/host/WindowHost.h
@@ -19,7 +19,7 @@ struct AfterLayoutEventArgs {};
 // The bridge between control tree and native window.
 class CRU_UI_API WindowHost : public Object {
   friend controls::Control;
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::host::WindowHost")
+  CRU_DEFINE_CLASS_LOG_TAG(u"WindowHost")
 
  public:
   explicit WindowHost(controls::Control* root_control);
diff --git a/include/cru/ui/render/BorderRenderObject.h b/include/cru/ui/render/BorderRenderObject.h
index 2fc74f0f..a71cd6a0 100644
--- a/include/cru/ui/render/BorderRenderObject.h
+++ b/include/cru/ui/render/BorderRenderObject.h
@@ -5,7 +5,7 @@
 
 namespace cru::ui::render {
 class CRU_UI_API BorderRenderObject : public SingleChildRenderObject {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::render::BorderRenderObject")
+  CRU_DEFINE_CLASS_LOG_TAG(u"BorderRenderObject")
 
  public:
   BorderRenderObject();
diff --git a/include/cru/ui/render/FlexLayoutRenderObject.h b/include/cru/ui/render/FlexLayoutRenderObject.h
index ff7340cb..4effacb1 100644
--- a/include/cru/ui/render/FlexLayoutRenderObject.h
+++ b/include/cru/ui/render/FlexLayoutRenderObject.h
@@ -93,7 +93,7 @@ struct FlexChildLayoutData {
 //
 class CRU_UI_API FlexLayoutRenderObject
     : public LayoutRenderObject<FlexChildLayoutData> {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::render::FlexLayoutRenderObject")
+  CRU_DEFINE_CLASS_LOG_TAG(u"FlexLayoutRenderObject")
 
  public:
   FlexLayoutRenderObject() = default;
diff --git a/include/cru/ui/render/RenderObject.h b/include/cru/ui/render/RenderObject.h
index 311ab044..e8dc3b17 100644
--- a/include/cru/ui/render/RenderObject.h
+++ b/include/cru/ui/render/RenderObject.h
@@ -36,7 +36,7 @@ namespace cru::ui::render {
  *  void OnLayoutContent(const Rect& content_rect) override;
  */
 class CRU_UI_API RenderObject : public Object {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::render::RenderObject")
+  CRU_DEFINE_CLASS_LOG_TAG(u"RenderObject")
 
  protected:
   RenderObject() = default;
diff --git a/include/cru/ui/render/SingleChildRenderObject.h b/include/cru/ui/render/SingleChildRenderObject.h
index cc9e4126..a98465f0 100644
--- a/include/cru/ui/render/SingleChildRenderObject.h
+++ b/include/cru/ui/render/SingleChildRenderObject.h
@@ -3,7 +3,7 @@
 
 namespace cru::ui::render {
 class CRU_UI_API SingleChildRenderObject : public RenderObject {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::render::SingleChildRenderObject")
+  CRU_DEFINE_CLASS_LOG_TAG(u"SingleChildRenderObject")
 
  public:
   SingleChildRenderObject() = default;
diff --git a/include/cru/ui/render/StackLayoutRenderObject.h b/include/cru/ui/render/StackLayoutRenderObject.h
index b522ecbb..4da63ea2 100644
--- a/include/cru/ui/render/StackLayoutRenderObject.h
+++ b/include/cru/ui/render/StackLayoutRenderObject.h
@@ -28,7 +28,7 @@ struct StackChildLayoutData {
 // to min size.
 class CRU_UI_API StackLayoutRenderObject
     : public LayoutRenderObject<StackChildLayoutData> {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::render:StackLayoutRenderObject")
+  CRU_DEFINE_CLASS_LOG_TAG(u"StackLayoutRenderObject")
 
  public:
   StackLayoutRenderObject() = default;
diff --git a/include/cru/ui/render/TextRenderObject.h b/include/cru/ui/render/TextRenderObject.h
index db8ff0d0..079c5680 100644
--- a/include/cru/ui/render/TextRenderObject.h
+++ b/include/cru/ui/render/TextRenderObject.h
@@ -18,7 +18,7 @@ namespace cru::ui::render {
 // If the result layout box is bigger than actual text box, then text is center
 // aligned.
 class CRU_UI_API TextRenderObject : public RenderObject {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::render::TextRenderObject")
+  CRU_DEFINE_CLASS_LOG_TAG(u"TextRenderObject")
 
  public:
   constexpr static float default_caret_width = 2;
diff --git a/include/cru/ui/render/TreeRenderObject.h b/include/cru/ui/render/TreeRenderObject.h
index 4a176926..8c589d7a 100644
--- a/include/cru/ui/render/TreeRenderObject.h
+++ b/include/cru/ui/render/TreeRenderObject.h
@@ -49,7 +49,7 @@ class CRU_UI_API TreeRenderObjectItem : public Object {
 };
 
 class CRU_UI_API TreeRenderObject : public RenderObject {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::render:TreeRenderObject")
+  CRU_DEFINE_CLASS_LOG_TAG(u"TreeRenderObject")
 
  public:
   TreeRenderObject();