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

Don't allow DestroyClippingRegion() to remove paint update area clipping with GTK3

Browse Source 
See #18560
This commit is contained in:
Paul Cornett
2019-10-31 23:30:18 -07:00
parent e376e74210
commit 4697ce23d9
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/gtk/dc.h
View File

@@ -63,8 +63,13 @@ public:
class wxPaintDCImpl: public wxGTKCairoDCImpl class wxPaintDCImpl: public wxGTKCairoDCImpl
{ {
typedef wxGTKCairoDCImpl BaseType;
public: public:
wxPaintDCImpl(wxPaintDC* owner, wxWindow* window); wxPaintDCImpl(wxPaintDC* owner, wxWindow* window);
virtual void DestroyClippingRegion() wxOVERRIDE;
private:
const wxRegion& m_clip;
wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl); wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
}; };

13
src/gtk/dc.cpp
View File

@@ -337,6 +337,7 @@ wxClientDCImpl::wxClientDCImpl(wxClientDC* owner, wxWindow* window)
wxPaintDCImpl::wxPaintDCImpl(wxPaintDC* owner, wxWindow* window) wxPaintDCImpl::wxPaintDCImpl(wxPaintDC* owner, wxWindow* window)
: wxGTKCairoDCImpl(owner, window) : wxGTKCairoDCImpl(owner, window)
, m_clip(window->m_nativeUpdateRegion)
{ {
cairo_t* cr = window->GTKPaintContext(); cairo_t* cr = window->GTKPaintContext();
wxCHECK_RET(cr, "using wxPaintDC without being in a native paint event"); wxCHECK_RET(cr, "using wxPaintDC without being in a native paint event");
@@ -345,6 +346,18 @@ wxPaintDCImpl::wxPaintDCImpl(wxPaintDC* owner, wxWindow* window)
gc->EnableOffset(m_contentScaleFactor <= 1); gc->EnableOffset(m_contentScaleFactor <= 1);
SetGraphicsContext(gc); SetGraphicsContext(gc);
} }
void wxPaintDCImpl::DestroyClippingRegion()
{
BaseType::DestroyClippingRegion();
// re-establish clip for paint update area
int x, y, w, h;
m_clip.GetBox(x, y, w, h);
cairo_t* cr = static_cast<cairo_t*>(GetCairoContext());
cairo_rectangle(cr, x, y, w, h);
cairo_clip(cr);
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner) wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner)

1
src/gtk/window.cpp
View File

@@ -5074,6 +5074,7 @@ void wxWindowGTK::GTKSendPaintEvents(const GdkRegion* region)
m_paintContext = cr; m_paintContext = cr;
m_updateRegion = wxRegion(int(x1), int(y1), int(x2 - x1), int(y2 - y1)); m_updateRegion = wxRegion(int(x1), int(y1), int(x2 - x1), int(y2 - y1));
m_nativeUpdateRegion = m_updateRegion;
#else // !__WXGTK3__ #else // !__WXGTK3__
m_updateRegion = wxRegion(region); m_updateRegion = wxRegion(region);
#if wxGTK_HAS_COMPOSITING_SUPPORT #if wxGTK_HAS_COMPOSITING_SUPPORT