projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use QMenu->popup() instead of QMenu->exec() everywhere
[pulseview.git]
/
pv
/
widgets
/
popup.cpp
diff --git
a/pv/widgets/popup.cpp
b/pv/widgets/popup.cpp
index 68f79f0f6fbeafe6066bc0a3bc96e4ad11d037d8..13282cda25e458b6b624de563f09e1fc6668a6b5 100644
(file)
--- a/
pv/widgets/popup.cpp
+++ b/
pv/widgets/popup.cpp
@@
-14,18
+14,16
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <algorithm>
*/
#include <algorithm>
+#include <cassert>
-#include <assert.h>
-
-#include <QtGui>
#include <QApplication>
#include <QDesktopWidget>
#include <QLineEdit>
#include <QApplication>
#include <QDesktopWidget>
#include <QLineEdit>
+#include <QtGui>
#include "popup.hpp"
#include "popup.hpp"
@@
-65,17
+63,16
@@
void Popup::set_position(const QPoint point, Position pos)
MarginWidth + ((pos == Bottom) ? ArrowLength : 0),
MarginWidth + ((pos == Left) ? ArrowLength : 0),
MarginWidth + ((pos == Top) ? ArrowLength : 0));
MarginWidth + ((pos == Bottom) ? ArrowLength : 0),
MarginWidth + ((pos == Left) ? ArrowLength : 0),
MarginWidth + ((pos == Top) ? ArrowLength : 0));
-
}
}
-bool Popup::eventFilter(QObject *obj, QEvent *evt)
+bool Popup::eventFilter(QObject *obj, QEvent *ev
en
t)
{
QKeyEvent *keyEvent;
(void)obj;
{
QKeyEvent *keyEvent;
(void)obj;
- if (evt->type() == QEvent::KeyPress) {
- keyEvent = static_cast<QKeyEvent*>(evt);
+ if (ev
en
t->type() == QEvent::KeyPress) {
+ keyEvent = static_cast<QKeyEvent*>(ev
en
t);
if (keyEvent->key() == Qt::Key_Enter ||
keyEvent->key() == Qt::Key_Return) {
close();
if (keyEvent->key() == Qt::Key_Enter ||
keyEvent->key() == Qt::Key_Return) {
close();
@@
-122,7
+119,7
@@
bool Popup::space_for_arrow() const
case Bottom:
if (point_.y() > y())
return false;
case Bottom:
if (point_.y() > y())
return false;
- return true;
+ return true;
case Left:
if (point_.x() < (x() + width()))
case Left:
if (point_.x() < (x() + width()))
@@
-143,10
+140,9
@@
QPolygon Popup::arrow_polygon() const
QPolygon poly;
const QPoint p = mapFromGlobal(point_);
QPolygon poly;
const QPoint p = mapFromGlobal(point_);
- const int l = ArrowLength + ArrowOverlap;
+ const int l = ArrowLength + ArrowOverlap;
- switch (pos_)
- {
+ switch (pos_) {
case Right:
poly << QPoint(p.x() + l, p.y() - l);
break;
case Right:
poly << QPoint(p.x() + l, p.y() - l);
break;
@@
-163,8
+159,7
@@
QPolygon Popup::arrow_polygon() const
poly << p;
poly << p;
- switch (pos_)
- {
+ switch (pos_) {
case Right:
case Bottom:
poly << QPoint(p.x() + l, p.y() + l);
case Right:
case Bottom:
poly << QPoint(p.x() + l, p.y() + l);
@@
-173,7
+168,7
@@
QPolygon Popup::arrow_polygon() const
case Left:
poly << QPoint(p.x() - l, p.y() + l);
break;
case Left:
poly << QPoint(p.x() - l, p.y() + l);
break;
-
+
case Top:
poly << QPoint(p.x() + l, p.y() - l);
break;
case Top:
poly << QPoint(p.x() + l, p.y() - l);
break;
@@
-238,7
+233,7
@@
void Popup::reposition_widget()
if (pos_ == Left)
o.rx() = -width();
if (pos_ == Left)
o.rx() = -width();
- else if(pos_ == Top)
+ else if
(pos_ == Top)
o.ry() = -height();
o += point_;
o.ry() = -height();
o += point_;
@@
-294,13
+289,13
@@
void Popup::resizeEvent(QResizeEvent*)
setMask(popup_region());
}
setMask(popup_region());
}
-void Popup::mouseReleaseEvent(QMouseEvent *e)
+void Popup::mouseReleaseEvent(QMouseEvent *e
vent
)
{
{
- assert(e);
+ assert(e
vent
);
// We need our own out-of-bounds click handler because QWidget counts
// the drop-shadow region as inside the widget
// We need our own out-of-bounds click handler because QWidget counts
// the drop-shadow region as inside the widget
- if
(!bubble_rect().contains(e
->pos()))
+ if
(!bubble_rect().contains(event
->pos()))
close();
}
close();
}