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

Added function to protect against null header when getting its height

Browse Source
This commit is contained in:
Matthew Griffin
2019-09-02 10:47:39 +01:00
parent e3f35e1082
commit 2780f1bde6
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/qt/listctrl.cpp
View File

@@ -141,6 +141,11 @@ public:
return m_editorFactory.GetEditControl(); return m_editorFactory.GetEditControl();
} }
int GetHeaderHeight() const
{
return header() != NULL ? header()->height() : 0;
}
private: private:
void itemClicked(QTreeWidgetItem * item, int column); void itemClicked(QTreeWidgetItem * item, int column);
void itemActivated(QTreeWidgetItem * item, int column); void itemActivated(QTreeWidgetItem * item, int column);
@@ -595,7 +600,7 @@ bool wxListCtrl::GetItemRect(long item, wxRect& rect, int WXUNUSED(code)) const
if ( qitem != NULL ) if ( qitem != NULL )
{ {
rect = wxQtConvertRect( m_qtTreeWidget->visualItemRect(qitem) ); rect = wxQtConvertRect( m_qtTreeWidget->visualItemRect(qitem) );
rect.Offset(0, m_qtTreeWidget->header()->height()); rect.Offset(0, m_qtTreeWidget->GetHeaderHeight());
return true; return true;
} }
else else
@@ -613,7 +618,7 @@ bool wxListCtrl::GetSubItemRect(long item, long subItem, wxRect& rect, int WXUNU
wxT("invalid column index in GetSubItemRect") ); wxT("invalid column index in GetSubItemRect") );
QModelIndex qindex = m_qtTreeWidget->model()->index(item, subItem); QModelIndex qindex = m_qtTreeWidget->model()->index(item, subItem);
rect = wxQtConvertRect( m_qtTreeWidget->visualRect(qindex) ); rect = wxQtConvertRect( m_qtTreeWidget->visualRect(qindex) );
rect.Offset(0, m_qtTreeWidget->header()->height()); rect.Offset(0, m_qtTreeWidget->GetHeaderHeight());
return true; return true;
} }
else else
@@ -914,7 +919,7 @@ long wxListCtrl::HitTest(const wxPoint& point, int &flags, long* ptrSubItem) con
{ {
// Remove the header height as qt expects point relative to the table sub widget // Remove the header height as qt expects point relative to the table sub widget
QPoint qPoint = wxQtConvertPoint(point); QPoint qPoint = wxQtConvertPoint(point);
qPoint.setY(qPoint.y() - m_qtTreeWidget->header()->height()); qPoint.setY(qPoint.y() - m_qtTreeWidget->GetHeaderHeight());
QModelIndex index = m_qtTreeWidget->indexAt(qPoint); QModelIndex index = m_qtTreeWidget->indexAt(qPoint);
if ( index.isValid() ) if ( index.isValid() )