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

Ensure that wxListCtrl::HitTest finds correct index under qt

Browse Source
This commit is contained in:
Matthew Griffin
2019-06-12 12:45:08 +01:00
parent 1bb4404527
commit f3ccc74a56
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/listctrl/listtest.cpp
View File

@@ -1515,7 +1515,8 @@ void MyListCtrl::OnContextMenu(wxContextMenuEvent& event)
{ {
point = ScreenToClient(point); point = ScreenToClient(point);
} }
ShowContextMenu(point); int flags;
ShowContextMenu(point, HitTest(point, flags));
} }
else else
{ {
@@ -1527,10 +1528,12 @@ void MyListCtrl::OnContextMenu(wxContextMenuEvent& event)
} }
#endif #endif
void MyListCtrl::ShowContextMenu(const wxPoint& pos) void MyListCtrl::ShowContextMenu(const wxPoint& pos, long item)
{ {
wxMenu menu; wxMenu menu;
wxString itemNumber;
itemNumber.Printf("Item %ld", item);
menu.Append(wxID_ANY, itemNumber);
menu.Append(wxID_ABOUT, "&About"); menu.Append(wxID_ABOUT, "&About");
menu.AppendSeparator(); menu.AppendSeparator();
menu.Append(wxID_EXIT, "E&xit"); menu.Append(wxID_EXIT, "E&xit");

2
samples/listctrl/listtest.h
View File

@@ -78,7 +78,7 @@ public:
virtual bool IsItemChecked(long item) const wxOVERRIDE; virtual bool IsItemChecked(long item) const wxOVERRIDE;
private: private:
void ShowContextMenu(const wxPoint& pos); void ShowContextMenu(const wxPoint& pos, long item);
wxLog *m_logOld; wxLog *m_logOld;
void SetColumnImage(int col, int image); void SetColumnImage(int col, int image);

6
src/qt/listctrl.cpp
View File

@@ -910,7 +910,11 @@ long wxListCtrl::FindItem(long WXUNUSED(start), const wxPoint& WXUNUSED(pt), int
long wxListCtrl::HitTest(const wxPoint& point, int &flags, long* ptrSubItem) const long wxListCtrl::HitTest(const wxPoint& point, int &flags, long* ptrSubItem) const
{ {
QModelIndex index = m_qtTreeWidget->indexAt(wxQtConvertPoint(point)); // Remove the header height as qt expects point relative to the table sub widget
QPoint qPoint = wxQtConvertPoint(point);
qPoint.setY(qPoint.y() - m_qtTreeWidget->header()->height());
QModelIndex index = m_qtTreeWidget->indexAt(qPoint);
if ( index.isValid() ) if ( index.isValid() )
{ {
flags = wxLIST_HITTEST_ONITEM; flags = wxLIST_HITTEST_ONITEM;