From bd44f9bc59c7fc2a8d2715d23368926aef5c5c32 Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 6 Sep 2021 22:19:25 +0800 Subject: ... --- include/cru/osx/graphics/quartz/TextLayout.hpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'include/cru/osx/graphics/quartz') diff --git a/include/cru/osx/graphics/quartz/TextLayout.hpp b/include/cru/osx/graphics/quartz/TextLayout.hpp index bfa2aee3..4a3830db 100644 --- a/include/cru/osx/graphics/quartz/TextLayout.hpp +++ b/include/cru/osx/graphics/quartz/TextLayout.hpp @@ -1,11 +1,12 @@ #pragma once -#include #include "Resource.hpp" #include "Font.hpp" #include "cru/common/Base.hpp" #include "cru/platform/graphics/TextLayout.hpp" +#include + namespace cru::platform::graphics::osx::quartz { class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout { public: @@ -18,9 +19,8 @@ class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout { ~OsxCTTextLayout() override; public: - std::u16string GetText() override; - std::u16string_view GetTextView() override; - void SetText(std::u16string new_text) override; + String GetText() override { return text_; } + void SetText(String new_text) override; std::shared_ptr GetFont() override; void SetFont(std::shared_ptr font) override; @@ -33,9 +33,18 @@ class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout { Point TextSinglePoint(Index position, bool trailing) override; TextHitTestResult HitTest(const Point& point) override; +private: + void RecreateFrame(); + private: + float max_width_; + float max_height_; + std::shared_ptr font_; + String text_; + CFStringRef cf_text_; + CTFramesetterRef ct_framesetter_; CTFrameRef ct_frame_; }; -- cgit v1.2.3