X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fpopup.cpp;h=73ac1d84bd81eb5d268bd48c82492c6d84afc935;hp=ec6e60c46568b0e40fd53c80fda3ea70356e1579;hb=092e2a0a3247f55a8f90680e1da694e744a2eee8;hpb=b213ef0991a13af0c74ffe5c54382c5c455c5496

diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index ec6e60c4..73ac1d84 100644
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -31,9 +31,9 @@ using namespace std;
 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),
@@ -64,6 +64,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;
@@ -144,13 +172,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
@@ -161,7 +195,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*)
@@ -172,6 +215,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(
@@ -181,6 +225,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)};