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

Merge branch 'renderer-fix'

Browse Source 
Miscellaneous wxRenderer-related fixes, notably fixing regressions
introduced by 0112a2dd1b (Merge branch 'renderer', 2021-07-06).

See https://github.com/wxWidgets/wxWidgets/pull/2412

Closes https://github.com/wxWidgets/wxWidgets/pull/2420
This commit is contained in:
Vadim Zeitlin
2021-07-10 23:59:09 +02:00
parent 75d508b6e6 3a587cee19
commit 49d799fcd3
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dc.h
View File

@@ -1478,7 +1478,7 @@ class WXDLLIMPEXP_CORE wxDCTextBgModeChanger
public: public:
wxDCTextBgModeChanger(wxDC& dc) : m_dc(dc), m_modeOld(wxBRUSHSTYLE_INVALID) { } wxDCTextBgModeChanger(wxDC& dc) : m_dc(dc), m_modeOld(wxBRUSHSTYLE_INVALID) { }
wxDCTextBgModeChanger(wxDC& dc, int mode) : m_dc(dc) wxDCTextBgModeChanger(wxDC& dc, int mode) : m_dc(dc), m_modeOld(wxBRUSHSTYLE_INVALID)
{ {
Set(mode); Set(mode);
} }

32
samples/render/render.cpp
View File

@@ -219,9 +219,9 @@ private:
wxRendererNative& renderer = m_useGeneric ? wxRendererNative::GetGeneric() wxRendererNative& renderer = m_useGeneric ? wxRendererNative::GetGeneric()
: wxRendererNative::Get(); : wxRendererNative::Get();
int x1 = 10, // text offset int x1 = FromDIP(10), // text offset
x2 = 300, // drawing offset x2 = FromDIP(300), // drawing offset
y = 10; y = FromDIP(10);
const int lineHeight = dc.GetCharHeight(); const int lineHeight = dc.GetCharHeight();
dc.DrawText("Demonstration of various wxRenderer functions:", x1, y); dc.DrawText("Demonstration of various wxRenderer functions:", x1, y);
@@ -247,7 +247,7 @@ private:
y += lineHeight*3; y += lineHeight*3;
const wxCoord heightHdr = renderer.GetHeaderButtonHeight(this); const wxCoord heightHdr = renderer.GetHeaderButtonHeight(this);
const wxCoord widthHdr = 120; const wxCoord width = 15*GetCharWidth();
const wxHeaderSortIconType const wxHeaderSortIconType
hdrSortIcon = m_useIcon ? wxHDR_SORT_ICON_UP hdrSortIcon = m_useIcon ? wxHDR_SORT_ICON_UP
@@ -266,13 +266,13 @@ private:
// implementation. // implementation.
dc.DrawText("DrawHeaderButton() (default)", x1, y); dc.DrawText("DrawHeaderButton() (default)", x1, y);
wxRendererNative::GetDefault().DrawHeaderButton(this, dc, wxRendererNative::GetDefault().DrawHeaderButton(this, dc,
wxRect(x2, y, widthHdr, heightHdr), m_flags, wxRect(x2, y, width, heightHdr), m_flags,
hdrSortIcon, &hdrParams); hdrSortIcon, &hdrParams);
y += lineHeight + heightHdr; y += lineHeight + heightHdr;
dc.DrawText("DrawHeaderButton() (overridden)", x1, y); dc.DrawText("DrawHeaderButton() (overridden)", x1, y);
renderer.DrawHeaderButton(this, dc, renderer.DrawHeaderButton(this, dc,
wxRect(x2, y, widthHdr, heightHdr), m_flags, wxRect(x2, y, width, heightHdr), m_flags,
hdrSortIcon, &hdrParams); hdrSortIcon, &hdrParams);
y += lineHeight + heightHdr; y += lineHeight + heightHdr;
@@ -307,7 +307,7 @@ private:
#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP #ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
dc.DrawText("DrawTitleBarBitmap()", x1, y); dc.DrawText("DrawTitleBarBitmap()", x1, y);
wxRect rBtn(x2, y, 21, 21); wxRect rBtn(x2, y, FromDIP(21), FromDIP(21));
renderer.DrawTitleBarBitmap(this, dc, rBtn, renderer.DrawTitleBarBitmap(this, dc, rBtn,
wxTITLEBAR_BUTTON_HELP, m_flags); wxTITLEBAR_BUTTON_HELP, m_flags);
rBtn.x += 2*rBtn.width; rBtn.x += 2*rBtn.width;
@@ -327,21 +327,21 @@ private:
#endif // wxHAS_DRAW_TITLE_BAR_BITMAP #endif // wxHAS_DRAW_TITLE_BAR_BITMAP
// The meanings of those are reversed for the vertical gauge below. // The meanings of those are reversed for the vertical gauge below.
const wxCoord heightGauge = 24; const wxCoord heightGauge = FromDIP(24);
const wxCoord widthGauge = 180; const wxCoord widthGauge = 30*GetCharWidth();
dc.DrawText("DrawGauge()", x1, y); dc.DrawText("DrawGauge()", x1, y);
renderer.DrawGauge(this, dc, renderer.DrawGauge(this, dc,
wxRect(x2, y, widthGauge, heightGauge), 25, 100, m_flags); wxRect(x2, y, widthGauge, heightGauge), 25, 100, m_flags);
renderer.DrawGauge(this, dc, renderer.DrawGauge(this, dc,
wxRect(x2 + widthGauge + 30, y + heightGauge - widthGauge, wxRect(x2 + widthGauge + FromDIP(30), y + heightGauge - widthGauge,
heightGauge, widthGauge), heightGauge, widthGauge),
25, 100, m_flags | wxCONTROL_SPECIAL); 25, 100, m_flags | wxCONTROL_SPECIAL);
y += lineHeight + heightGauge; y += lineHeight + heightGauge;
const wxCoord heightListItem = 48; const wxCoord heightListItem = FromDIP(48);
const wxCoord widthListItem = 260; const wxCoord widthListItem = 30*GetCharWidth();
dc.DrawText("DrawItemSelectionRect()", x1, y); dc.DrawText("DrawItemSelectionRect()", x1, y);
renderer.DrawItemSelectionRect(this, dc, renderer.DrawItemSelectionRect(this, dc,
@@ -352,10 +352,10 @@ private:
y += heightListItem; y += heightListItem;
dc.DrawText("DrawChoice()", x1, y + 20); y += lineHeight;
renderer.DrawChoice(this, dc, wxRect(x2, y, 80, 50), m_flags); dc.DrawText("DrawChoice()", x1, y);
y += 50; renderer.DrawChoice(this, dc,
wxRect(x2, y, width, 1.5*GetCharHeight()), m_flags);
} }
int m_flags; int m_flags;

4
src/msw/renderer.cpp
View File

@@ -1011,7 +1011,7 @@ wxRendererXP::DrawItemSelectionRect(wxWindow *win,
const wxRect& rect, const wxRect& rect,
int flags) int flags)
{ {
wxUxThemeHandle hTheme(win, L"EXPLORER::LISTVIEW"); wxUxThemeHandle hTheme(win, L"EXPLORER::LISTVIEW;LISTVIEW");
const int itemState = GetListItemState(flags); const int itemState = GetListItemState(flags);
@@ -1038,7 +1038,7 @@ void wxRendererXP::DrawItemText(wxWindow* win,
int flags, int flags,
wxEllipsizeMode ellipsizeMode) wxEllipsizeMode ellipsizeMode)
{ {
wxUxThemeHandle hTheme(win, L"EXPLORER::LISTVIEW"); wxUxThemeHandle hTheme(win, L"EXPLORER::LISTVIEW;LISTVIEW");
const int itemState = GetListItemState(flags); const int itemState = GetListItemState(flags);