aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa/PlatCocoa.h
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2021-03-19 16:15:16 +1100
committerNeil <nyamatongwe@gmail.com>2021-03-19 16:15:16 +1100
commit8b8a02b4bd250d28bc0f42287ca3d167b7210f39 (patch)
treed8d42a94f5abdaf1247db4fc5bf766c9a72cfbe9 /cocoa/PlatCocoa.h
parent09534ab81f72ce766c8d13ea13216dd589d41a1c (diff)
downloadscintilla-mirror-8b8a02b4bd250d28bc0f42287ca3d167b7210f39.tar.gz
UTF-8 text drawing and measurement.
Move SurfaceGDI::WidthText to match declaration order.
Diffstat (limited to 'cocoa/PlatCocoa.h')
-rw-r--r--cocoa/PlatCocoa.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h
index 1ddb203c7..b918e5ed0 100644
--- a/cocoa/PlatCocoa.h
+++ b/cocoa/PlatCocoa.h
@@ -104,6 +104,7 @@ public:
void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) override;
void Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSource) override;
std::unique_ptr<IScreenLineLayout> Layout(const IScreenLine *screenLine) override;
+
void DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourDesired fore,
ColourDesired back) override;
void DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourDesired fore,
@@ -111,6 +112,15 @@ public:
void DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourDesired fore) override;
void MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) override;
XYPOSITION WidthText(const Font *font_, std::string_view text) override;
+
+ void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourDesired fore,
+ ColourDesired back) override;
+ void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourDesired fore,
+ ColourDesired back) override;
+ void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourDesired fore) override;
+ void MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) override;
+ XYPOSITION WidthTextUTF8(const Font *font_, std::string_view text) override;
+
XYPOSITION Ascent(const Font *font_) override;
XYPOSITION Descent(const Font *font_) override;
XYPOSITION InternalLeading(const Font *font_) override;