From 32aa6f116acc6e3e20a1ec76cef45b29f7005ad7 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Fri, 17 Oct 2025 12:06:14 +0800 Subject: Remove String stage 1. --- include/cru/ui/render/RenderObject.h | 2 ++ include/cru/ui/render/ScrollBar.h | 2 +- include/cru/ui/render/TextRenderObject.h | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'include/cru/ui/render') diff --git a/include/cru/ui/render/RenderObject.h b/include/cru/ui/render/RenderObject.h index 80fa2e10..eba3b6c4 100644 --- a/include/cru/ui/render/RenderObject.h +++ b/include/cru/ui/render/RenderObject.h @@ -4,6 +4,8 @@ #include "MeasureRequirement.h" #include "cru/base/String.h" +#include + namespace cru::ui::render { struct BoxConstraint { static const BoxConstraint kNotLimit; diff --git a/include/cru/ui/render/ScrollBar.h b/include/cru/ui/render/ScrollBar.h index 45f80389..fbe14244 100644 --- a/include/cru/ui/render/ScrollBar.h +++ b/include/cru/ui/render/ScrollBar.h @@ -39,7 +39,7 @@ enum class ScrollBarAreaKind { enum class ScrollBarBrushUsageKind { Arrow, ArrowBackground, Slot, Thumb }; enum class ScrollBarBrushStateKind { Normal, Hover, Press, Disable }; -String CRU_UI_API GenerateScrollBarThemeColorKey(ScrollBarBrushUsageKind usage, +std::string CRU_UI_API GenerateScrollBarThemeColorKey(ScrollBarBrushUsageKind usage, ScrollBarBrushStateKind state); class CRU_UI_API ScrollBar : public Object { diff --git a/include/cru/ui/render/TextRenderObject.h b/include/cru/ui/render/TextRenderObject.h index 72958f6f..b8d1882d 100644 --- a/include/cru/ui/render/TextRenderObject.h +++ b/include/cru/ui/render/TextRenderObject.h @@ -35,8 +35,8 @@ class CRU_UI_API TextRenderObject : public RenderObject { TextRenderObject& operator=(TextRenderObject&& other) = delete; ~TextRenderObject() override; - String GetText() const; - void SetText(String new_text); + std::string GetText() const; + void SetText(std::string new_text); std::shared_ptr GetBrush() { return brush_; } void SetBrush(std::shared_ptr new_brush); -- cgit v1.2.3