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

Add more FromDIP() calls to generic wxDataViewCtrl renderers

Browse Source 
Some of them had been already updated to return the values scaled
appropriately for the current DPI in 56fab0aabb (Improve wxDataView on
DPI change, 2019-01-10), but not all, so add the missing calls to
wxDataView{Progress,IconText}Renderer too.
This commit is contained in:
Vadim Zeitlin
2022-01-22 17:08:11 +00:00
parent 2c18e772c2
commit 1a1c02804b
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/generic/datavgen.cpp
View File

@@ -1514,7 +1514,7 @@ wxSize wxDataViewProgressRenderer::GetSize() const
// renderers, it doesn't have a "good" width for the content. This makes it // renderers, it doesn't have a "good" width for the content. This makes it
// grow to the whole column, which is pretty much always the desired // grow to the whole column, which is pretty much always the desired
// behaviour. Keep the height fixed so that the progress bar isn't too fat. // behaviour. Keep the height fixed so that the progress bar isn't too fat.
return wxSize(-1, 12); return GetView()->FromDIP(wxSize(-1, 12));
} }
// --------------------------------------------------------- // ---------------------------------------------------------
@@ -1557,7 +1557,7 @@ bool wxDataViewIconTextRenderer::Render(wxRect rect, wxDC *dc, int state)
if ( icon.IsOk() ) if ( icon.IsOk() )
{ {
dc->DrawIcon(icon, rect.x, rect.y + (rect.height - icon.GetHeight())/2); dc->DrawIcon(icon, rect.x, rect.y + (rect.height - icon.GetHeight())/2);
xoffset = icon.GetWidth()+4; xoffset = icon.GetWidth() + GetView()->FromDIP(4);
} }
RenderText(m_value.GetText(), xoffset, rect, dc, state); RenderText(m_value.GetText(), xoffset, rect, dc, state);
@@ -1567,15 +1567,17 @@ bool wxDataViewIconTextRenderer::Render(wxRect rect, wxDC *dc, int state)
wxSize wxDataViewIconTextRenderer::GetSize() const wxSize wxDataViewIconTextRenderer::GetSize() const
{ {
wxWindow* const dvc = GetView();
if (!m_value.GetText().empty()) if (!m_value.GetText().empty())
{ {
wxSize size = GetTextExtent(m_value.GetText()); wxSize size = GetTextExtent(m_value.GetText());
if (m_value.GetIcon().IsOk()) if (m_value.GetIcon().IsOk())
size.x += m_value.GetIcon().GetWidth() + 4; size.x += m_value.GetIcon().GetWidth() + dvc->FromDIP(4);
return size; return size;
} }
return wxSize(80,20); return dvc->FromDIP(wxSize(80,20));
} }
wxWindow* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value) wxWindow* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value)
@@ -1588,7 +1590,9 @@ wxWindow* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect
// adjust the label rect to take the width of the icon into account // adjust the label rect to take the width of the icon into account
if (iconText.GetIcon().IsOk()) if (iconText.GetIcon().IsOk())
{ {
int w = iconText.GetIcon().GetWidth() + 4; wxWindow* const dvc = GetView();
int w = iconText.GetIcon().GetWidth() + dvc->FromDIP(4);
labelRect.x += w; labelRect.x += w;
labelRect.width -= w; labelRect.width -= w;
} }