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

Fix horizontal scrolling of wxPropertyGrid header

Browse Source 
wxPropertyGridHeader associated with wxPropertyGrid has to be notified about every horizontal scroll of the grid.
New position is sent with dedicated wxEVT_PG_HSCROLL event being handled by wxPropertyGridManager which in turn scrolls the header accordingly.

See #18313.
This commit is contained in:
Artur Wieczorek
2019-01-07 20:14:35 +01:00
parent 8555f4abb0
commit eb40eb4b84
4 changed files with 74 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/propgrid/propgrid.cpp
View File

@@ -1275,6 +1275,38 @@ bool wxPropertyGrid::Reparent( wxWindowBase *newParent )
return res;
}
// -----------------------------------------------------------------------
void wxPropertyGrid::ScrollWindow(int dx, int dy, const wxRect* rect)
{
wxControl::ScrollWindow(dx, dy, rect);
if ( dx != 0 )
{
// Notify wxPropertyGridManager about the grid being scrolled horizontally
// to scroll the column header, if present.
SendEvent(wxEVT_PG_HSCROLL, dx);
}
}
// -----------------------------------------------------------------------
void wxPropertyGrid::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
int noUnitsX, int noUnitsY,
int xPos, int yPos, bool noRefresh)
{
int oldX;
CalcUnscrolledPosition(0, 0, &oldX, NULL);
wxScrollHelper::SetScrollbars(pixelsPerUnitX, pixelsPerUnitY,
noUnitsX, noUnitsY, xPos, yPos, noRefresh);
int newX;
CalcUnscrolledPosition(0, 0, &newX, NULL);
if ( newX != oldX )
{
// Notify wxPropertyGridManager about the grid being scrolled horizontally
// to scroll the column header, if present.
SendEvent(wxEVT_PG_HSCROLL, oldX - newX);
}
}
// -----------------------------------------------------------------------
// wxPropertyGrid Font and Colour Methods
// -----------------------------------------------------------------------
@@ -4752,6 +4784,21 @@ bool wxPropertyGrid::SendEvent( int eventType, wxPGProperty* p,
return evt.WasVetoed();
}
void wxPropertyGrid::SendEvent(wxEventType eventType, int intVal)
{
wxPropertyGridEvent evt(eventType, m_eventObject->GetId());
evt.SetPropertyGrid(this);
evt.SetEventObject(m_eventObject);
evt.SetProperty(NULL);
evt.SetColumn(0);
evt.SetInt(intVal);
wxPropertyGridEvent* prevProcessedEvent = m_processedEvent;
m_processedEvent = &evt;
m_eventObject->HandleWindowEvent(evt);
m_processedEvent = prevProcessedEvent;
}
// -----------------------------------------------------------------------
// Return false if should be skipped
@@ -6276,6 +6323,7 @@ wxDEFINE_EVENT( wxEVT_PG_LABEL_EDIT_ENDING, wxPropertyGridEvent );
wxDEFINE_EVENT( wxEVT_PG_COL_BEGIN_DRAG, wxPropertyGridEvent );
wxDEFINE_EVENT( wxEVT_PG_COL_DRAGGING, wxPropertyGridEvent );
wxDEFINE_EVENT( wxEVT_PG_COL_END_DRAG, wxPropertyGridEvent );
wxDEFINE_EVENT( wxEVT_PG_HSCROLL, wxPropertyGridEvent);
// -----------------------------------------------------------------------