Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MGR: Work around a wxWidgets 3.0 bug in wxGenericListCtrl (Linux only) which causes headers to be misaligned after horizontal scrolling.

This commit is contained in:
Charlie Fenton 2015-01-14 02:32:34 -08:00
parent 82dbec6671
commit 68d4d4e699
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
clientgui/BOINCListCtrl.cpp
View File

@ -30,6 +30,23 @@
#define GetColumnIndexFromOrder(x) x #define GetColumnIndexFromOrder(x) x
#endif #endif
BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)
EVT_PAINT(MyEvtHandler::OnPaint)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(MyEvtHandler, wxEvtHandler)
MyEvtHandler::MyEvtHandler() {}
MyEvtHandler::MyEvtHandler(CBOINCListCtrl *theListControl) {
m_listCtrl = theListControl;
#ifdef __WXGTK__
m_view_startX = 0;
#endif
}
DEFINE_EVENT_TYPE(wxEVT_CHECK_SELECTION_CHANGED) DEFINE_EVENT_TYPE(wxEVT_CHECK_SELECTION_CHANGED)
#if USE_NATIVE_LISTCONTROL #if USE_NATIVE_LISTCONTROL
@ -52,11 +69,6 @@ BEGIN_EVENT_TABLE(CBOINCListCtrl, LISTCTRL_BASE)
END_EVENT_TABLE() END_EVENT_TABLE()
BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)
EVT_PAINT(MyEvtHandler::OnPaint)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(CBOINCListCtrl, LISTCTRL_BASE) IMPLEMENT_DYNAMIC_CLASS(CBOINCListCtrl, LISTCTRL_BASE)
@ -585,6 +597,20 @@ void MyEvtHandler::OnPaint(wxPaintEvent & event)
if (m_listCtrl) { if (m_listCtrl) {
m_listCtrl->savedHandler->ProcessEvent(event); m_listCtrl->savedHandler->ProcessEvent(event);
m_listCtrl->DrawProgressBars(); m_listCtrl->DrawProgressBars();
#ifdef __WXGTK__
// Work around a wxWidgets 3.0 bug in wxGenericListCtrl (Linux
// only) which causes headers to be misaligned after horizontal
// scrolling due to wxListHeaderWindow::OnPaint() calling
// parent->GetViewStart() before the parent window has been
// scrolled to the new position.
int view_startX;
m_listCtrl->GetViewStart( &view_startX, NULL );
if (view_startX != m_view_startX) {
m_view_startX = view_startX;
((wxWindow *)m_listCtrl->m_headerWin)->Refresh();
((wxWindow *)m_listCtrl->m_headerWin)->Update();
}
#endif
} else { } else {
event.Skip(); event.Skip();
} }
@ -623,4 +649,3 @@ void CBOINCListCtrl::RefreshCell(int row, int col) {
GetSubItemRect(row, col, r); GetSubItemRect(row, col, r);
RefreshRect(r); RefreshRect(r);
} }

11
clientgui/BOINCListCtrl.h
View File

@ -168,12 +168,21 @@ END_DECLARE_EVENT_TYPES()
// Define a custom event handler // Define a custom event handler
class MyEvtHandler : public wxEvtHandler class MyEvtHandler : public wxEvtHandler
{ {
DECLARE_DYNAMIC_CLASS(MyEvtHandler)
public: public:
MyEvtHandler(CBOINCListCtrl *theListControl) { m_listCtrl = theListControl; } MyEvtHandler();
MyEvtHandler(CBOINCListCtrl *theListControl);
void OnPaint(wxPaintEvent & event); void OnPaint(wxPaintEvent & event);
private: private:
CBOINCListCtrl * m_listCtrl; CBOINCListCtrl * m_listCtrl;
#if !USE_NATIVE_LISTCONTROL
#ifdef __WXGTK__
int m_view_startX;
#endif
#endif
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };