diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-12-14 13:15:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-12-14 13:15:19 +0100 |
| commit | 7f88b65f6cde3d69386e461f61271a271b79b7e8 (patch) | |
| tree | c01bfcc823cae66433a91285a579a6bd0e590ee0 /src/gui_dwrite.cpp | |
| parent | a6d4849c711379b773529afaed640455287ac934 (diff) | |
patch 8.0.1390: DirectX scrolling can be slow, vertical positioning is offv8.0.1390
Problem: DirectX scrolling can be slow, vertical positioning is off.
Solution: Make scroll slightly faster when using "scrlines:1". Fix y
position of displayed text. Fix DirectX with non-utf8 encoding.
(Ken Takata, closes #2440)
Diffstat (limited to 'src/gui_dwrite.cpp')
| -rw-r--r-- | src/gui_dwrite.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/gui_dwrite.cpp b/src/gui_dwrite.cpp index e1d19db8da..3c940a3042 100644 --- a/src/gui_dwrite.cpp +++ b/src/gui_dwrite.cpp @@ -38,7 +38,11 @@ # define _Outptr_ #endif -#include <dwrite_2.h> +#ifdef FEAT_DIRECTX_COLOR_EMOJI +# include <dwrite_2.h> +#else +# include <dwrite.h> +#endif #include "gui_dwrite.h" @@ -284,7 +288,9 @@ struct DWriteContext { ID2D1SolidColorBrush *mBrush; IDWriteFactory *mDWriteFactory; +#ifdef FEAT_DIRECTX_COLOR_EMOJI IDWriteFactory2 *mDWriteFactory2; +#endif IDWriteGdiInterop *mGdiInterop; IDWriteRenderingParams *mRenderingParams; @@ -481,6 +487,7 @@ public: AdjustedGlyphRun adjustedGlyphRun(glyphRun, context->cellWidth, context->offsetX); +#ifdef FEAT_DIRECTX_COLOR_EMOJI if (pDWC_->mDWriteFactory2 != NULL) { IDWriteColorGlyphRunEnumerator *enumerator = NULL; @@ -517,6 +524,7 @@ public: return S_OK; } } +#endif // Draw by IDWriteFactory (without color emoji) pDWC_->mRT->DrawGlyphRun( @@ -589,7 +597,9 @@ DWriteContext::DWriteContext() : mGDIRT(NULL), mBrush(NULL), mDWriteFactory(NULL), +#ifdef FEAT_DIRECTX_COLOR_EMOJI mDWriteFactory2(NULL), +#endif mGdiInterop(NULL), mRenderingParams(NULL), mFontCache(8), @@ -618,6 +628,7 @@ DWriteContext::DWriteContext() : mDWriteFactory); } +#ifdef FEAT_DIRECTX_COLOR_EMOJI if (SUCCEEDED(hr)) { DWriteCreateFactory( @@ -626,6 +637,7 @@ DWriteContext::DWriteContext() : reinterpret_cast<IUnknown**>(&mDWriteFactory2)); _RPT1(_CRT_WARN, "IDWriteFactory2: %s\n", SUCCEEDED(hr) ? "available" : "not available"); } +#endif if (SUCCEEDED(hr)) { @@ -647,7 +659,9 @@ DWriteContext::~DWriteContext() SafeRelease(&mRenderingParams); SafeRelease(&mGdiInterop); SafeRelease(&mDWriteFactory); +#ifdef FEAT_DIRECTX_COLOR_EMOJI SafeRelease(&mDWriteFactory2); +#endif SafeRelease(&mBrush); SafeRelease(&mGDIRT); SafeRelease(&mRT); @@ -995,7 +1009,7 @@ DWriteContext::DrawText(const WCHAR *text, int len, TextRenderer renderer(this); TextRendererContext context = { color, FLOAT(cellWidth), 0.0f }; - textLayout->Draw(&context, &renderer, FLOAT(x), FLOAT(y)); + textLayout->Draw(&context, &renderer, FLOAT(x), FLOAT(y) - 0.5f); } SafeRelease(&textLayout); |