Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-17 17:02:51 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Generalize Wine workaround to TransformedWithMatrixAndStd() too

Browse Source 
Previously this was only needed in TransformedWithMatrixAndStdEx() which
verified that conversion actually worked, but not in the non-Ex version
using individual coordinates as it only verified that the conversions
failed, which they also did under Wine.

But now that they should work (and do, under native Windows), we need
the same workaround there as well.

Also make sure that we output the warning message about the workaround
not being needed any longer only once and only if it's really not needed
(if it's used for some values, we still have to keep it, even if it's
not used for the other ones).
This commit is contained in:
Vadim Zeitlin
2026-04-04 23:35:31 +02:00
parent 5d28a30c50
commit f736265bb9
1 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/graphics/coords.cpp
+41 -12
View File
@@ -463,6 +463,44 @@ static void TransformedWithMatrixEx(wxDC& dc)
#endif // wxUSE_DC_TRANSFORM_MATRIX
}
static void
ApplyWineWorkaround(wxPoint& posLog, const wxPoint2DDouble& posLogRef)
{
if ( !wxIsRunningUnderWine() )
return;
static class WorkaroundWasUsed
{
public:
WorkaroundWasUsed() = default;
~WorkaroundWasUsed()
{
if ( !m_wasUsed )
WARN("Wine workaround is not needed any longer");
}
void Apply(wxPoint& posLog, const wxPoint2DDouble& posLogRef)
{
// Current versions of Wine seem to have a bug and return a value
// which is one off from DPtoLP() used by wxDC::DeviceToLogical()
// and there doesn't seem to be anything we can do about it, so
// just tweak the result to pass this test.
if ( posLog.x == posLogRef.m_x + 1 )
{
posLog.x--;
m_wasUsed = true;
}
}
private:
bool m_wasUsed = false;
} s_workaroundWasUsed;
s_workaroundWasUsed.Apply(posLog, posLogRef);
}
static void TransformedWithMatrixAndStd(wxDC& dc)
{
// Apply combination of standard and matrix transformations
@@ -491,6 +529,8 @@ static void TransformedWithMatrixAndStd(wxDC& dc)
wxPoint posLog;
posLog.x = dc.DeviceToLogicalX(s_posDev.x);
posLog.y = dc.DeviceToLogicalY(s_posDev.y);
ApplyWineWorkaround(posLog, posLogRef);
CHECK(posLog == wxPoint(wxRound(posLogRef.m_x), wxRound(posLogRef.m_y)));
wxPoint2DDouble dimLogRef = m1.TransformDistance(wxPoint2DDouble(s_dimDev.x, s_dimDev.y));
@@ -541,18 +581,7 @@ static void TransformedWithMatrixAndStdEx(wxDC& dc)
wxPoint posLog;
posLog = dc.DeviceToLogical(s_posDev);
if ( wxIsRunningUnderWine() )
{
// Current versions of Wine seem to have a bug and return a value
// which is one off from DPtoLP() used by wxDC::DeviceToLogical()
// and there doesn't seem to be anything we can do about it, so
// just tweak the result to pass this test.
if ( posLog.x == posLogRef.m_x + 1 )
posLog.x--;
else
WARN("Wine workaround might be not needed any longer");
}
ApplyWineWorkaround(posLog, posLogRef);
CHECK(posLog == wxPoint(wxRound(posLogRef.m_x), wxRound(posLogRef.m_y)));
wxPoint2DDouble dimLogRef = m1.TransformDistance(wxPoint2DDouble(s_dimDev.x, s_dimDev.y));