From 2e003602f29edff5d38137472edee82fab9f5376 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 2 Jun 2018 08:37:47 +1000 Subject: Define IScreenLineLayout as the main interface for implementing bidirectional features by platform code. Implement IScreenLineLayout for Win32 / DirectWrite as ScreenLineLayout. --- qt/ScintillaEditBase/PlatQt.cpp | 14 ++------------ qt/ScintillaEditBase/PlatQt.h | 4 +--- 2 files changed, 3 insertions(+), 15 deletions(-) (limited to 'qt') diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index 325878ae5..9ae9ce03b 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -409,19 +409,9 @@ void SurfaceImpl::Copy(PRectangle rc, Point from, Surface &surfaceSource) GetPainter()->drawPixmap(rc.left, rc.top, *pixmap, from.x, from.y, -1, -1); } -size_t SurfaceImpl::PositionFromX(const IScreenLine *, XYPOSITION, bool) +std::unique_ptr SurfaceImpl::Layout(const IScreenLine *) { - return 0; -} - -XYPOSITION SurfaceImpl::XFromPosition(const IScreenLine *, size_t) -{ - return 0; -} - -std::vector SurfaceImpl::FindRangeIntervals(const IScreenLine *, size_t, size_t) -{ - return std::vector(); + return {}; } void SurfaceImpl::DrawTextNoClip(PRectangle rc, diff --git a/qt/ScintillaEditBase/PlatQt.h b/qt/ScintillaEditBase/PlatQt.h index 1b83035a1..7c2ed2fa4 100644 --- a/qt/ScintillaEditBase/PlatQt.h +++ b/qt/ScintillaEditBase/PlatQt.h @@ -105,9 +105,7 @@ public: ColourDesired back) override; void Copy(PRectangle rc, 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 FindRangeIntervals(const IScreenLine *screenLine, size_t start, size_t end) override; + std::unique_ptr Layout(const IScreenLine *screenLine) override; void DrawTextNoClip(PRectangle rc, Font &font, XYPOSITION ybase, std::string_view text, ColourDesired fore, ColourDesired back) override; -- cgit v1.2.3