Mercurial > octave-nkf
comparison libgui/graphics/Canvas.cc @ 20034:0376c1225660
Fix ginput to return button number with Qt toolkit (bug #44676).
* Canvas.cc (canvasMousePressEvent): Supply "button_number (event)" as first
argument when running post_callback() for "windowbuttondownfcn".
author | Rik <rik@octave.org> |
---|---|
date | Tue, 31 Mar 2015 11:31:32 -0700 |
parents | 3cc0734283dc |
children | c3a40003aa42 |
comparison
equal
deleted
inserted
replaced
20033:91e2212b060d | 20034:0376c1225660 |
---|---|
591 Utils::figureSelectionType (event), false); | 591 Utils::figureSelectionType (event), false); |
592 | 592 |
593 updateCurrentPoint (figObj, obj, event); | 593 updateCurrentPoint (figObj, obj, event); |
594 | 594 |
595 gh_manager::post_callback (figObj.get_handle (), | 595 gh_manager::post_callback (figObj.get_handle (), |
596 "windowbuttondownfcn"); | 596 "windowbuttondownfcn", |
597 button_number (event)); | |
597 | 598 |
598 gh_manager::post_callback (currentObj.get_handle (), | 599 gh_manager::post_callback (currentObj.get_handle (), |
599 "buttondownfcn", button_number (event)); | 600 "buttondownfcn", |
601 button_number (event)); | |
600 | 602 |
601 if (event->button () == Qt::RightButton) | 603 if (event->button () == Qt::RightButton) |
602 ContextMenu::executeAt (currentObj.get_properties (), | 604 ContextMenu::executeAt (currentObj.get_properties (), |
603 event->globalPos ()); | 605 event->globalPos ()); |
604 break; | 606 break; |