Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix retrieving empty bounding box for D2D graphics path

Browse Source 
Return "zero rectangle" (0, 0, 0, 0) if bounding box is empty.
This commit is contained in:
Artur Wieczorek
2018-07-28 11:43:31 +02:00
parent e25ab3e421
commit 74306708bc
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/graphicsd2d.cpp
View File

@@ -1847,11 +1847,17 @@ void wxD2DPathData::GetBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble *h) c
{
D2D1_RECT_F bounds;
ID2D1Geometry *curGeometry = GetFullGeometry();
curGeometry->GetBounds(D2D1::Matrix3x2F::Identity(), &bounds);
if (x != NULL) *x = bounds.left;
if (y != NULL) *y = bounds.top;
if (w != NULL) *w = bounds.right - bounds.left;
if (h != NULL) *h = bounds.bottom - bounds.top;
HRESULT hr = curGeometry->GetBounds(D2D1::Matrix3x2F::Identity(), &bounds);
wxCHECK_HRESULT_RET(hr);
// Check if bounds are empty
if ( bounds.left > bounds.right )
{
bounds.left = bounds.top = bounds.right = bounds.bottom = 0.0F;
}
if (x) *x = bounds.left;
if (y) *y = bounds.top;
if (w) *w = bounds.right - bounds.left;
if (h) *h = bounds.bottom - bounds.top;
}
bool wxD2DPathData::Contains(wxDouble x, wxDouble y, wxPolygonFillMode WXUNUSED(fillStyle)) const