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

Fix wxPropertyGrid row height on DPI change

Browse Source 
Fix collapse button size of wxPropertyGrid in High DPI.
This commit is contained in:
Maarten Bent
2019-01-13 15:28:10 +01:00
parent 62c5b2d8d1
commit a1c3fa0468
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/propgrid/propgrid.h
View File

@@ -1766,6 +1766,8 @@ protected:
void OnSysColourChanged( wxSysColourChangedEvent &event ); void OnSysColourChanged( wxSysColourChangedEvent &event );
void OnDPIChanged(wxDPIChangedEvent& event);
void OnTLPClose( wxCloseEvent& event ); void OnTLPClose( wxCloseEvent& event );
protected: protected:

16
src/propgrid/propgrid.cpp
View File

@@ -260,6 +260,7 @@ wxBEGIN_EVENT_TABLE(wxPropertyGrid, wxControl)
EVT_SET_FOCUS(wxPropertyGrid::OnFocusEvent) EVT_SET_FOCUS(wxPropertyGrid::OnFocusEvent)
EVT_KILL_FOCUS(wxPropertyGrid::OnFocusEvent) EVT_KILL_FOCUS(wxPropertyGrid::OnFocusEvent)
EVT_SYS_COLOUR_CHANGED(wxPropertyGrid::OnSysColourChanged) EVT_SYS_COLOUR_CHANGED(wxPropertyGrid::OnSysColourChanged)
EVT_DPI_CHANGED(wxPropertyGrid::OnDPIChanged)
EVT_MOTION(wxPropertyGrid::OnMouseMove) EVT_MOTION(wxPropertyGrid::OnMouseMove)
EVT_LEFT_DOWN(wxPropertyGrid::OnMouseClick) EVT_LEFT_DOWN(wxPropertyGrid::OnMouseClick)
EVT_LEFT_UP(wxPropertyGrid::OnMouseUp) EVT_LEFT_UP(wxPropertyGrid::OnMouseUp)
@@ -453,9 +454,9 @@ void wxPropertyGrid::Init2()
m_cursorSizeWE = new wxCursor( wxCURSOR_SIZEWE ); m_cursorSizeWE = new wxCursor( wxCURSOR_SIZEWE );
// adjust bitmap icon y position so they are centered // adjust bitmap icon y position so they are centered
m_vspacing = wxPG_DEFAULT_VSPACING; m_vspacing = FromDIP(wxPG_DEFAULT_VSPACING);
CalculateFontAndBitmapStuff( wxPG_DEFAULT_VSPACING ); CalculateFontAndBitmapStuff( m_vspacing );
// Allocate cell data // Allocate cell data
m_propertyDefaultCell.SetEmptyData(); m_propertyDefaultCell.SetEmptyData();
@@ -1167,7 +1168,7 @@ void wxPropertyGrid::SetExtraStyle( long exStyle )
// returns the best acceptable minimal size // returns the best acceptable minimal size
wxSize wxPropertyGrid::DoGetBestSize() const wxSize wxPropertyGrid::DoGetBestSize() const
{ {
int lineHeight = wxMax(15, m_lineHeight); int lineHeight = wxMax(FromDIP(15), m_lineHeight);
// don't make the grid too tall (limit height to 10 items) but don't // don't make the grid too tall (limit height to 10 items) but don't
// make it too small neither // make it too small neither
@@ -1301,7 +1302,7 @@ void wxPropertyGrid::CalculateFontAndBitmapStuff( int vspacing )
m_fontHeight = y; m_fontHeight = y;
#if wxPG_USE_RENDERER_NATIVE #if wxPG_USE_RENDERER_NATIVE
m_iconWidth = wxPG_ICON_WIDTH; m_iconWidth = FromDIP(wxPG_ICON_WIDTH);
#elif wxPG_ICON_WIDTH #elif wxPG_ICON_WIDTH
// scale icon // scale icon
m_iconWidth = (m_fontHeight * wxPG_ICON_WIDTH) / 13; m_iconWidth = (m_fontHeight * wxPG_ICON_WIDTH) / 13;
@@ -1356,6 +1357,13 @@ void wxPropertyGrid::OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event
} }
} }
void wxPropertyGrid::OnDPIChanged(wxDPIChangedEvent &WXUNUSED(event))
{
m_vspacing = FromDIP(wxPG_DEFAULT_VSPACING);
CalculateFontAndBitmapStuff(m_vspacing);
Refresh();
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
static wxColour wxPGAdjustColour(const wxColour& src, int ra, static wxColour wxPGAdjustColour(const wxColour& src, int ra,