diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-06-02 08:37:47 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-06-02 08:37:47 +1000 |
| commit | 2e003602f29edff5d38137472edee82fab9f5376 (patch) | |
| tree | efcd2d4466c2bb894d5354d0652e986fdfcbea22 /cocoa | |
| parent | e67783d907b0ae186d794b205cf89c645fe50270 (diff) | |
| download | scintilla-mirror-2e003602f29edff5d38137472edee82fab9f5376.tar.gz | |
Define IScreenLineLayout as the main interface for implementing bidirectional
features by platform code.
Implement IScreenLineLayout for Win32 / DirectWrite as ScreenLineLayout.
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/PlatCocoa.h | 4 | ||||
| -rw-r--r-- | cocoa/PlatCocoa.mm | 12 |
2 files changed, 3 insertions, 13 deletions
diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h index bc80e9fce..7a2c578e9 100644 --- a/cocoa/PlatCocoa.h +++ b/cocoa/PlatCocoa.h @@ -98,9 +98,7 @@ public: void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) override; void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) override; void Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSource) override; - size_t PositionFromX(const IScreenLine *screenLine, XYPOSITION xDistance, bool charPosition) override; - XYPOSITION XFromPosition(const IScreenLine *screenLine, size_t caretPosition) override; - std::vector<Interval> FindRangeIntervals(const IScreenLine *screenLine, size_t start, size_t end) override; + std::unique_ptr<IScreenLineLayout> Layout(const IScreenLine *screenLine) override; void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, std::string_view text, ColourDesired fore, ColourDesired back) override; void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, std::string_view text, ColourDesired fore, diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index 62a0ba5f0..aca57b81a 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -821,16 +821,8 @@ void SurfaceImpl::Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSou // Bidirectional text support for Arabic and Hebrew not currently implemented on Cocoa. -size_t SurfaceImpl::PositionFromX(const IScreenLine *, XYPOSITION, bool) { - return 0; -} - -XYPOSITION SurfaceImpl::XFromPosition(const IScreenLine *, size_t) { - return 0; -} - -std::vector<Interval> SurfaceImpl::FindRangeIntervals(const IScreenLine *, size_t, size_t) { - return std::vector<Interval>(); +std::unique_ptr<IScreenLineLayout> SurfaceImpl::Layout(const IScreenLine *screenLine) { + return {}; } //-------------------------------------------------------------------------------------------------- |