projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Logging: Make logging thread-safe
[pulseview.git]
/
pv
/
widgets
/
popup.cpp
diff --git
a/pv/widgets/popup.cpp
b/pv/widgets/popup.cpp
index f9713b18c7163c6bf58672fa6743707dce5cc839..13282cda25e458b6b624de563f09e1fc6668a6b5 100644
(file)
--- a/
pv/widgets/popup.cpp
+++ b/
pv/widgets/popup.cpp
@@
-18,13
+18,12
@@
*/
#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"
@@
-120,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()))
@@
-141,7
+140,7
@@
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_) {
case Right:
switch (pos_) {
case Right:
@@
-169,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;