From f9c2d24bb6f4f99f6a3fa4f4898f36540e9284f8 Mon Sep 17 00:00:00 2001 From: ali kettab Date: Sun, 18 Feb 2024 17:32:15 +0100 Subject: [PATCH] wxQt! Refactoring only --- src/qt/brush.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/qt/brush.cpp b/src/qt/brush.cpp index 4c2d9d6dfd..b37b3cc601 100644 --- a/src/qt/brush.cpp +++ b/src/qt/brush.cpp @@ -74,6 +74,15 @@ public: m_style = data.m_style; } + void DoSetStipple(const wxBitmap& stipple) + { + m_qtBrush.setTexture(*stipple.GetHandle()); + if (stipple.GetMask() != nullptr) + m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE; + else + m_style = wxBRUSHSTYLE_STIPPLE; + } + bool operator == (const wxBrushRefData& data) const { return m_qtBrush == data.m_qtBrush; @@ -113,11 +122,8 @@ wxBrush::wxBrush(const wxColour& col, int style) wxBrush::wxBrush(const wxBitmap& stipple) { m_refData = new wxBrushRefData(); - M_BRUSHDATA.setTexture(*stipple.GetHandle()); - if (stipple.GetMask() != nullptr) - M_STYLEDATA = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE; - else - M_STYLEDATA = wxBRUSHSTYLE_STIPPLE; + + static_cast(m_refData)->DoSetStipple(stipple); } @@ -143,12 +149,8 @@ void wxBrush::SetStyle(wxBrushStyle style) void wxBrush::SetStipple(const wxBitmap& stipple) { AllocExclusive(); - M_BRUSHDATA.setTexture(*stipple.GetHandle()); - if (stipple.GetMask() != nullptr) - M_STYLEDATA = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE; - else - M_STYLEDATA = wxBRUSHSTYLE_STIPPLE; + static_cast(m_refData)->DoSetStipple(stipple); }