Update #include directives to work with Qt5 as well as Qt4

[pulseview.git] / pv / widgets / popup.cpp

diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index 399f5e28b6d56d4d525b896a371208f304c7bb97..9bdbd76412e5e99cd355c9888b102c9386116692 100644 (file)
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -20,18 +20,23 @@
 
 #include <algorithm>
 
+#include <assert.h>
+
 #include <QtGui>
+#include <QApplication>
+#include <QDesktopWidget>
 
 #include "popup.h"
 
-using namespace std;
+using std::max;
+using std::min;
 
 namespace pv {
 namespace widgets {
 
-const unsigned int Popup::ArrowLength = 15;
+const unsigned int Popup::ArrowLength = 10;
 const unsigned int Popup::ArrowOverlap = 3;
-const unsigned int Popup::MarginWidth = 10;
+const unsigned int Popup::MarginWidth = 6;
 
 Popup::Popup(QWidget *parent) :
        QWidget(parent, Qt::Popup | Qt::FramelessWindowHint),
@@ -62,6 +67,34 @@ void Popup::set_position(const QPoint point, Position pos)
 
 }
 
+bool Popup::space_for_arrow() const
+{
+       // Check if there is room for the arrow
+       switch (_pos) {
+       case Right:
+               if (_point.x() > x())
+                       return false;
+               return true;
+
+       case Bottom:
+               if (_point.y() > y())
+                       return false;
+               return true;            
+
+       case Left:
+               if (_point.x() < (x() + width()))
+                       return false;
+               return true;
+
+       case Top:
+               if (_point.y() < (y() + height()))
+                       return false;
+               return true;
+       }
+
+       return true;
+}
+
 QPolygon Popup::arrow_polygon() const
 {
        QPolygon poly;
@@ -142,13 +175,19 @@ QRegion Popup::bubble_region() const
 
 QRegion Popup::popup_region() const
 {
-       return arrow_region().united(bubble_region());
+       if (space_for_arrow())
+               return arrow_region().united(bubble_region());
+       else
+               return bubble_region();
 }
 
 void Popup::reposition_widget()
 {
        QPoint o;
 
+       const QRect screen_rect = QApplication::desktop()->availableGeometry(
+               QApplication::desktop()->screenNumber(_point));
+
        if (_pos == Right || _pos == Left)
                o.ry() = -height() / 2;
        else
@@ -159,7 +198,16 @@ void Popup::reposition_widget()
        else if(_pos == Top)
                o.ry() = -height();
 
-       move(_point + o);
+       o += _point;
+       move(max(min(o.x(), screen_rect.right() - width()),
+                       screen_rect.left()),
+               max(min(o.y(), screen_rect.bottom() - height()),
+                       screen_rect.top()));
+}
+
+void Popup::closeEvent(QCloseEvent*)
+{
+       closed();
 }
 
 void Popup::paintEvent(QPaintEvent*)
@@ -170,6 +218,7 @@ void Popup::paintEvent(QPaintEvent*)
        const QColor outline_color(QApplication::palette().color(
                QPalette::Dark));
 
+       // Draw the bubble
        const QRegion b = bubble_region();
        const QRegion bubble_outline = QRegion(rect()).subtracted(
                b.translated(1, 0).intersected(b.translated(0, 1).intersected(
@@ -179,6 +228,10 @@ void Popup::paintEvent(QPaintEvent*)
        painter.setBrush(QApplication::palette().brush(QPalette::Window));
        painter.drawRect(rect());
 
+       // Draw the arrow
+       if (!space_for_arrow())
+               return;
+
        const QPoint ArrowOffsets[] = {
                QPoint(1, 0), QPoint(0, -1), QPoint(-1, 0), QPoint(0, 1)};