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

Fix setting clipping region for wxDC with RTL enabled (wxMSW)

Browse Source 
It turns out that region being added to DC with enabled RTL layout needs
to be defined using mirrored device x-coordinates.
So if we have DC with RTL layout we need to create a temporary mirrored
region and pass it to the DC instead of the original one.

Closes #19325.
This commit is contained in:
Artur Wieczorek
2021-11-28 17:04:26 +01:00
parent b04c1ace47
commit 288b208a0a
2 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/dc.h
View File

@@ -281,7 +281,7 @@ protected:
void DrawAnyText(const wxString& text, wxCoord x, wxCoord y);
// common part of DoSetClippingRegion() and DoSetDeviceClippingRegion()
void SetClippingHrgn(WXHRGN hrgn);
void SetClippingHrgn(WXHRGN hrgn, bool doRtlOffset = false);
// implementation of DoGetSize() for wxScreen/PrinterDC: this simply
// returns the size of the entire device this DC is associated with

47
src/msw/dc.cpp
View File

@@ -604,14 +604,53 @@ bool wxMSWDCImpl::DoGetClippingRect(wxRect& rect) const
}
// common part of DoSetClippingRegion() and DoSetDeviceClippingRegion()
void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn)
void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn, bool doRtlOffset)
{
wxCHECK_RET( hrgn, wxT("invalid clipping region") );
HRGN hRgnRTL = NULL;
// DC with enabled RTL layout needs a mirrored region
// so we have to create such a region temporarily.
if ( GetLayoutDirection() == wxLayout_RightToLeft )
{
DWORD bufLen = ::GetRegionData(hrgn, 0, NULL); // Get the storage size
char* pDataBuf = new char[bufLen]; // Buffer for the region data
if ( ::GetRegionData(hrgn, bufLen, reinterpret_cast<RGNDATA*>(pDataBuf)) != bufLen )
{
wxLogLastError("GetRegionData");
delete[] pDataBuf;
return;
}
int dcw, dch;
DoGetSize(&dcw, &dch);
XFORM tr;
tr.eM11 = -1;
tr.eM12 = 0;
tr.eM21 = 0;
tr.eM22 = 1;
// For region created directly with device coordinates
// (regions passed to DoSetDeviceClippingRegion) we have to
// apply additional 1-pixel offset because original right edge
// passed to e.g. CreateRectRgn() (in wxRegion) is actually
// not included in the clipping area but this edge will become
// a left edge after mirroring and therefore its x-coordinates
// shoulde be adjusted.
tr.eDx = doRtlOffset ? dcw : dcw-1; // max X
tr.eDy = 0;
hRgnRTL = ::ExtCreateRegion(&tr, bufLen, reinterpret_cast<RGNDATA*>(pDataBuf));
delete[] pDataBuf;
if ( !hRgnRTL )
{
wxLogLastError("ExtCreateRegion");
return;
}
}
AutoHRGN rgnRTL(hRgnRTL);
// note that we combine the new clipping region with the existing one: this
// is compatible with what the other ports do and is the documented
// behaviour now (starting with 2.3.3)
if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR )
if ( ::ExtSelectClipRgn(GetHdc(), rgnRTL ? rgnRTL : (HRGN)hrgn, RGN_AND) == ERROR )
{
wxLogLastError(wxT("ExtSelectClipRgn"));
@@ -668,7 +707,7 @@ void wxMSWDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h
}
else
{
SetClippingHrgn((WXHRGN)hrgn);
SetClippingHrgn((WXHRGN)hrgn, false);
::DeleteObject(hrgn);
}
@@ -676,7 +715,7 @@ void wxMSWDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h
void wxMSWDCImpl::DoSetDeviceClippingRegion(const wxRegion& region)
{
SetClippingHrgn(region.GetHRGN());
SetClippingHrgn(region.GetHRGN(), true);
}
void wxMSWDCImpl::DestroyClippingRegion()