X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fpopup.cpp;h=17bc719130a5ef49eb9c2acdfc60c4696593a93f;hp=47280d1ff6ddd892116228f41ccac17088a78dae;hb=2ad82c2e40b6865481733913a2c32735602f63c4;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5 diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp index 47280d1..17bc719 100644 --- a/pv/widgets/popup.cpp +++ b/pv/widgets/popup.cpp @@ -27,7 +27,7 @@ #include #include -#include "popup.h" +#include "popup.hpp" using std::max; using std::min; @@ -65,7 +65,6 @@ void Popup::set_position(const QPoint point, Position pos) MarginWidth + ((pos == Bottom) ? ArrowLength : 0), MarginWidth + ((pos == Left) ? ArrowLength : 0), MarginWidth + ((pos == Top) ? ArrowLength : 0)); - } bool Popup::eventFilter(QObject *obj, QEvent *evt) @@ -145,8 +144,7 @@ QPolygon Popup::arrow_polygon() const const QPoint p = mapFromGlobal(point_); const int l = ArrowLength + ArrowOverlap; - switch (pos_) - { + switch (pos_) { case Right: poly << QPoint(p.x() + l, p.y() - l); break; @@ -155,7 +153,7 @@ QPolygon Popup::arrow_polygon() const poly << QPoint(p.x() - l, p.y() + l); break; - case Left: + case Left: case Top: poly << QPoint(p.x() - l, p.y() - l); break; @@ -163,14 +161,13 @@ QPolygon Popup::arrow_polygon() const poly << p; - switch (pos_) - { + switch (pos_) { case Right: case Bottom: poly << QPoint(p.x() + l, p.y() + l); break; - case Left: + case Left: poly << QPoint(p.x() - l, p.y() + l); break; @@ -238,7 +235,7 @@ void Popup::reposition_widget() if (pos_ == Left) o.rx() = -width(); - else if(pos_ == Top) + else if (pos_ == Top) o.ry() = -height(); o += point_; @@ -300,7 +297,7 @@ void Popup::mouseReleaseEvent(QMouseEvent *e) // 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(e->pos())) close(); } @@ -311,4 +308,3 @@ void Popup::showEvent(QShowEvent*) } // namespace widgets } // namespace pv -