b53f7ac904
Changes of d245dc9e1f (Fix drawing of dotted lines with wxDC in wxMSW,
2020-03-27) improved the appearance of dotted and dashed lines in wxMSW
but at the expense of significant (up to a factor of 300) slowdown.
Allow the applications for which the drawing performance is important to
explicitly request the old behaviour, with uglier, but faster, pens by
choosing to use low quality pens.
Update the graphics benchmark to allow specifying the pen quality and
verify that the performance when using it is the same as before 3.1.4.
See https://github.com/wxWidgets/wxWidgets/pull/2218
See #7097.
Closes #18875.
152 lines
4.6 KiB
C++
152 lines
4.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/pen.h
|
|
// Purpose: Base header for wxPen
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created:
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PEN_H_BASE_
|
|
#define _WX_PEN_H_BASE_
|
|
|
|
#include "wx/gdiobj.h"
|
|
#include "wx/peninfobase.h"
|
|
|
|
// Possible values for pen quality.
|
|
enum wxPenQuality
|
|
{
|
|
wxPEN_QUALITY_DEFAULT, // Select the appropriate quality automatically.
|
|
wxPEN_QUALITY_LOW, // Less good looking but faster.
|
|
wxPEN_QUALITY_HIGH // Best looking, at the expense of speed.
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxPenInfo contains all parameters describing a wxPen
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class wxPenInfo : public wxPenInfoBase<wxPenInfo>
|
|
{
|
|
public:
|
|
explicit wxPenInfo(const wxColour& colour = wxColour(),
|
|
int width = 1,
|
|
wxPenStyle style = wxPENSTYLE_SOLID)
|
|
: wxPenInfoBase<wxPenInfo>(colour, style)
|
|
{
|
|
m_width = width;
|
|
m_quality = wxPEN_QUALITY_DEFAULT;
|
|
}
|
|
|
|
// Setters
|
|
|
|
wxPenInfo& Width(int width)
|
|
{ m_width = width; return *this; }
|
|
|
|
wxPenInfo& Quality(wxPenQuality quality)
|
|
{ m_quality = quality; return *this; }
|
|
wxPenInfo& LowQuality() { return Quality(wxPEN_QUALITY_LOW); }
|
|
wxPenInfo& HighQuality() { return Quality(wxPEN_QUALITY_HIGH); }
|
|
|
|
// Accessors
|
|
|
|
int GetWidth() const { return m_width; }
|
|
|
|
wxPenQuality GetQuality() const { return m_quality; }
|
|
|
|
private:
|
|
int m_width;
|
|
wxPenQuality m_quality;
|
|
};
|
|
|
|
|
|
class WXDLLIMPEXP_CORE wxPenBase : public wxGDIObject
|
|
{
|
|
public:
|
|
virtual ~wxPenBase() { }
|
|
|
|
virtual void SetColour(const wxColour& col) = 0;
|
|
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0;
|
|
|
|
virtual void SetWidth(int width) = 0;
|
|
virtual void SetStyle(wxPenStyle style) = 0;
|
|
virtual void SetStipple(const wxBitmap& stipple) = 0;
|
|
virtual void SetDashes(int nb_dashes, const wxDash *dash) = 0;
|
|
virtual void SetJoin(wxPenJoin join) = 0;
|
|
virtual void SetCap(wxPenCap cap) = 0;
|
|
virtual void SetQuality(wxPenQuality quality) { wxUnusedVar(quality); }
|
|
|
|
virtual wxColour GetColour() const = 0;
|
|
virtual wxBitmap *GetStipple() const = 0;
|
|
virtual wxPenStyle GetStyle() const = 0;
|
|
virtual wxPenJoin GetJoin() const = 0;
|
|
virtual wxPenCap GetCap() const = 0;
|
|
virtual wxPenQuality GetQuality() const { return wxPEN_QUALITY_DEFAULT; }
|
|
virtual int GetWidth() const = 0;
|
|
virtual int GetDashes(wxDash **ptr) const = 0;
|
|
|
|
// Convenient helpers for testing whether the pen is a transparent one:
|
|
// unlike GetStyle() == wxPENSTYLE_TRANSPARENT, they work correctly even if
|
|
// the pen is invalid (they both return false in this case).
|
|
bool IsTransparent() const
|
|
{
|
|
return IsOk() && GetStyle() == wxPENSTYLE_TRANSPARENT;
|
|
}
|
|
|
|
bool IsNonTransparent() const
|
|
{
|
|
return IsOk() && GetStyle() != wxPENSTYLE_TRANSPARENT;
|
|
}
|
|
};
|
|
|
|
#if defined(__WXMSW__)
|
|
#include "wx/msw/pen.h"
|
|
#elif defined(__WXMOTIF__) || defined(__WXX11__)
|
|
#include "wx/x11/pen.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/pen.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/pen.h"
|
|
#elif defined(__WXDFB__)
|
|
#include "wx/dfb/pen.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/pen.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/pen.h"
|
|
#endif
|
|
|
|
class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase
|
|
{
|
|
public:
|
|
wxPen *FindOrCreatePen(const wxColour& colour,
|
|
int width = 1,
|
|
wxPenStyle style = wxPENSTYLE_SOLID);
|
|
|
|
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
|
|
wxPen *FindOrCreatePen(const wxColour& colour, int width, int style)
|
|
{ return FindOrCreatePen(colour, width, (wxPenStyle)style); }
|
|
};
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList;
|
|
|
|
// provide comparison operators to allow code such as
|
|
//
|
|
// if ( pen.GetStyle() == wxTRANSPARENT )
|
|
//
|
|
// to compile without warnings which it would otherwise provoke from some
|
|
// compilers as it compares elements of different enums
|
|
|
|
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
|
|
inline bool operator==(wxPenStyle s, wxDeprecatedGUIConstants t)
|
|
{
|
|
return static_cast<int>(s) == static_cast<int>(t);
|
|
}
|
|
|
|
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
|
|
inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t)
|
|
{
|
|
return static_cast<int>(s) != static_cast<int>(t);
|
|
}
|
|
|
|
#endif // _WX_PEN_H_BASE_
|