diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2017-03-04 01:37:52 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2017-03-04 02:47:50 +0200 |
| commit | c328c26a67a865d965cb8bde1b248eeae92f4e75 (patch) | |
| tree | 7e2294b68d22356977f6ba4af08f3341a4f0e135 /vcl/inc | |
| parent | df4f30560a1297e2a42a66f20660d53004e44f0b (diff) | |
SalLayout::GetBoundRect() works just fine here
Change-Id: Idce9a8f374f62bd92756d7391ccca3122c89683e
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/win/salgdi.h | 2 | ||||
| -rw-r--r-- | vcl/inc/win/winlayout.hxx | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index e357083e7a4d..3af90cbefae3 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -299,7 +299,7 @@ protected: private: // local helpers - static void DrawTextLayout(const CommonSalLayout&, HDC, bool bUseDWrite); + void DrawTextLayout(const CommonSalLayout&, HDC, bool bUseDWrite); public: // public SalGraphics methods, the interface to the independent vcl part diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx index cca6a46919e3..42b25b62c91f 100644 --- a/vcl/inc/win/winlayout.hxx +++ b/vcl/inc/win/winlayout.hxx @@ -177,7 +177,9 @@ public: virtual ~TextOutRenderer() = default; - virtual bool operator ()(CommonSalLayout const &rLayout, HDC hDC, + virtual bool operator ()(CommonSalLayout const &rLayout, + SalGraphics &rGraphics, + HDC hDC, const Rectangle* pRectToErase, Point* pPos, int* pGetNextGlypInfo) = 0; }; @@ -190,7 +192,9 @@ class ExTextOutRenderer : public TextOutRenderer public: explicit ExTextOutRenderer() = default; - bool operator ()(CommonSalLayout const &rLayout, HDC hDC, + bool operator ()(CommonSalLayout const &rLayout, + SalGraphics &rGraphics, + HDC hDC, const Rectangle* pRectToErase, Point* pPos, int* pGetNextGlypInfo) override; }; @@ -213,7 +217,9 @@ public: explicit D2DWriteTextOutRenderer(); virtual ~D2DWriteTextOutRenderer() override; - bool operator ()(CommonSalLayout const &rLayout, HDC hDC, + bool operator ()(CommonSalLayout const &rLayout, + SalGraphics &rGraphics, + HDC hDC, const Rectangle* pRectToErase, Point* pPos, int* pGetNextGlypInfo) override; @@ -245,7 +251,6 @@ private: D2DWriteTextOutRenderer & operator = (const D2DWriteTextOutRenderer &) = delete; bool GetDWriteFaceFromHDC(HDC hDC, IDWriteFontFace ** ppFontFace, float * lfSize) const; - bool GetDWriteInkBox(CommonSalLayout const &rLayout, Rectangle &) const; ID2D1Factory * mpD2DFactory; IDWriteFactory * mpDWriteFactory; |