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

Fix calculating bounding box

Browse Source 
We should use platform-specific functions to convert coordinates to take
into account all transformations applied to wxDC (also with transform
matrix).

Closes #18916.
This commit is contained in:
Artur Wieczorek
2020-09-13 23:54:16 +02:00
parent 014bd2ae54
commit e88f248e3a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/dc.h
View File

@@ -332,8 +332,9 @@ public:
virtual void CalcBoundingBox(wxCoord x, wxCoord y) virtual void CalcBoundingBox(wxCoord x, wxCoord y)
{ {
// Bounding box is internally stored in device units. // Bounding box is internally stored in device units.
x = LogicalToDeviceX(x); wxPoint ptDev = LogicalToDevice(x, y);
y = LogicalToDeviceY(y); x = ptDev.x;
y = ptDev.y;
if ( m_isBBoxValid ) if ( m_isBBoxValid )
{ {
if ( x < m_minX ) m_minX = x; if ( x < m_minX ) m_minX = x;
@@ -359,10 +360,10 @@ public:
} }
// Get bounding box in logical units. // Get bounding box in logical units.
wxCoord MinX() const { return m_isBBoxValid ? DeviceToLogicalX(m_minX) : 0; } wxCoord MinX() const { return m_isBBoxValid ? DeviceToLogical(m_minX, m_minY).x : 0; }
wxCoord MaxX() const { return m_isBBoxValid ? DeviceToLogicalX(m_maxX) : 0; } wxCoord MaxX() const { return m_isBBoxValid ? DeviceToLogical(m_maxX, m_maxY).x : 0; }
wxCoord MinY() const { return m_isBBoxValid ? DeviceToLogicalY(m_minY) : 0; } wxCoord MinY() const { return m_isBBoxValid ? DeviceToLogical(m_minX, m_minY).y : 0; }
wxCoord MaxY() const { return m_isBBoxValid ? DeviceToLogicalY(m_maxY) : 0; } wxCoord MaxY() const { return m_isBBoxValid ? DeviceToLogical(m_maxX, m_maxY).y : 0; }
// setters and getters // setters and getters