diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-12-03 19:18:23 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-12-03 19:18:23 +1100 |
| commit | c581972c2c6134391fd939223c5e9a48819ecae5 (patch) | |
| tree | 7d04d27187794ef3e66de13a78a4158cb8976a6c | |
| parent | c8d7f8df7318a9eeba2e49994618eff0f225494d (diff) | |
| download | scintilla-mirror-c581972c2c6134391fd939223c5e9a48819ecae5.tar.gz | |
Backport: Bug [#2144]. Fixed drawing of translucent rounded rectangles with Direct2D.
Backport of changeset 7782:da8db8ba734d.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | win32/PlatWin.cxx | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index c47d097bc..27afc2f46 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -598,6 +598,10 @@ <a href="https://sourceforge.net/p/scintilla/bugs/2137/">Bug #2137</a>. </li> <li> + Fixed drawing of translucent rounded rectangles on Win32 with Direct2D. + <a href="https://sourceforge.net/p/scintilla/bugs/2144/">Bug #2144</a>. + </li> + <li> Setting rectangular selection made faster. <a href="https://sourceforge.net/p/scintilla/bugs/2130/">Bug #2130</a>. </li> diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index ce8aecb96..14516d30e 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -1344,7 +1344,7 @@ void SurfaceD2D::AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fil const float cornerSizeF = static_cast<float>(cornerSize); D2D1_ROUNDED_RECT roundedRectFill = { D2D1::RectF(std::round(rc.left) + 1.0f, rc.top + 1.0f, std::round(rc.right) - 1.0f, rc.bottom - 1.0f), - cornerSizeF, cornerSizeF}; + cornerSizeF - 1.0f, cornerSizeF - 1.0f }; D2DPenColour(fill, alphaFill); pRenderTarget->FillRoundedRectangle(roundedRectFill, pBrush); |