diff options
Diffstat (limited to 'include/cru/platform/graphics')
4 files changed, 12 insertions, 11 deletions
diff --git a/include/cru/platform/graphics/direct2d/Factory.h b/include/cru/platform/graphics/direct2d/Factory.h index 7abdc31f..e96950fd 100644 --- a/include/cru/platform/graphics/direct2d/Factory.h +++ b/include/cru/platform/graphics/direct2d/Factory.h @@ -44,11 +44,11 @@ class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsFactory std::unique_ptr<IGeometryBuilder> CreateGeometryBuilder() override; - std::unique_ptr<IFont> CreateFont(String font_family, + std::unique_ptr<IFont> CreateFont(std::string font_family, float font_size) override; std::unique_ptr<ITextLayout> CreateTextLayout(std::shared_ptr<IFont> font, - String text) override; + std::string text) override; IImageFactory* GetImageFactory() override; diff --git a/include/cru/platform/graphics/direct2d/Font.h b/include/cru/platform/graphics/direct2d/Font.h index 841a57b5..86576592 100644 --- a/include/cru/platform/graphics/direct2d/Font.h +++ b/include/cru/platform/graphics/direct2d/Font.h @@ -12,7 +12,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteFont public virtual IFont, public virtual IComResource<IDWriteTextFormat> { public: - DWriteFont(DirectGraphicsFactory* factory, String font_family, + DWriteFont(DirectGraphicsFactory* factory, std::string font_family, float font_size); CRU_DELETE_COPY(DWriteFont) @@ -25,11 +25,11 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteFont return text_format_.Get(); } - String GetFontName() override; + std::string GetFontName() override; float GetFontSize() override; private: - String font_family_; + std::string font_family_; Microsoft::WRL::ComPtr<IDWriteTextFormat> text_format_; }; } // namespace cru::platform::graphics::direct2d diff --git a/include/cru/platform/graphics/direct2d/Resource.h b/include/cru/platform/graphics/direct2d/Resource.h index 6d2f968c..63459294 100644 --- a/include/cru/platform/graphics/direct2d/Resource.h +++ b/include/cru/platform/graphics/direct2d/Resource.h @@ -12,7 +12,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API DirectResource : public Object, public virtual IPlatformResource { public: - static String kPlatformId; + static std::string kPlatformId; protected: DirectResource() = default; @@ -24,7 +24,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API DirectResource ~DirectResource() override = default; public: - String GetPlatformId() const final { return kPlatformId; } + std::string GetPlatformId() const final { return kPlatformId; } }; class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsResource diff --git a/include/cru/platform/graphics/direct2d/TextLayout.h b/include/cru/platform/graphics/direct2d/TextLayout.h index 9f2e75a9..a41c3c6c 100644 --- a/include/cru/platform/graphics/direct2d/TextLayout.h +++ b/include/cru/platform/graphics/direct2d/TextLayout.h @@ -16,7 +16,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteTextLayout public virtual IComResource<IDWriteTextLayout> { public: DWriteTextLayout(DirectGraphicsFactory* factory, std::shared_ptr<IFont> font, - String text); + std::string text); CRU_DELETE_COPY(DWriteTextLayout) CRU_DELETE_MOVE(DWriteTextLayout) @@ -29,8 +29,8 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteTextLayout } public: - String GetText() override; - void SetText(String new_text) override; + std::string GetText() override; + void SetText(std::string new_text) override; std::shared_ptr<IFont> GetFont() override; void SetFont(std::shared_ptr<IFont> font) override; @@ -54,7 +54,8 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteTextLayout private: bool edit_mode_ = false; - String text_; + std::string text_; + std::wstring utf16_text_; std::shared_ptr<DWriteFont> font_; float max_width_ = std::numeric_limits<float>::max(); float max_height_ = std::numeric_limits<float>::max(); |