X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fwidgets%2Fpopup.cpp;h=bcfd8753c6b6dbe2c8e6da5a8032d75057b8bc50;hb=1ed73ebd60336c7b12ee1807644dca719cb9835b;hp=f9713b18c7163c6bf58672fa6743707dce5cc839;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git

diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index f9713b18..bcfd8753 100644
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -18,13 +18,18 @@
  */
 
 #include <algorithm>
+#include <cassert>
 
-#include <assert.h>
-
-#include <QtGui>
 #include <QApplication>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QScreen>
+#else
 #include <QDesktopWidget>
+#endif
 #include <QLineEdit>
+#include <QScrollBar>
+#include <QStyle>
+#include <QtGui>
 
 #include "popup.hpp"
 
@@ -38,6 +43,33 @@ const unsigned int Popup::ArrowLength = 10;
 const unsigned int Popup::ArrowOverlap = 3;
 const unsigned int Popup::MarginWidth = 6;
 
+
+QWidthAdjustingScrollArea::QWidthAdjustingScrollArea(QWidget* parent) :
+	QScrollArea(parent)
+{
+}
+
+void QWidthAdjustingScrollArea::setWidget(QWidget* w)
+{
+	QScrollArea::setWidget(w);
+	// It happens that QScrollArea already filters widget events,
+	// but that's an implementation detail that we shouldn't rely on.
+	w->installEventFilter(this);
+}
+
+bool QWidthAdjustingScrollArea::eventFilter(QObject* obj, QEvent* ev)
+{
+	if (obj == widget() && ev->type() == QEvent::Resize) {
+		if (widget()->height() > height())
+			setMinimumWidth(widget()->width() + qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent));
+		else
+			setMinimumWidth(widget()->width());
+	}
+
+	return QScrollArea::eventFilter(obj, ev);
+}
+
+
 Popup::Popup(QWidget *parent) :
 	QWidget(parent, Qt::Popup | Qt::FramelessWindowHint),
 	point_(),
@@ -120,7 +152,7 @@ bool Popup::space_for_arrow() const
 	case Bottom:
 		if (point_.y() > y())
 			return false;
-		return true;		
+		return true;
 
 	case Left:
 		if (point_.x() < (x() + width()))
@@ -141,7 +173,7 @@ QPolygon Popup::arrow_polygon() const
 	QPolygon poly;
 
 	const QPoint p = mapFromGlobal(point_);
-	const int l = ArrowLength + ArrowOverlap; 
+	const int l = ArrowLength + ArrowOverlap;
 
 	switch (pos_) {
 	case Right:
@@ -169,7 +201,7 @@ QPolygon Popup::arrow_polygon() const
 	case Left:
 		poly << QPoint(p.x() - l, p.y() + l);
 		break;
-		
+
 	case Top:
 		poly << QPoint(p.x() + l, p.y() - l);
 		break;
@@ -224,8 +256,12 @@ void Popup::reposition_widget()
 {
 	QPoint o;
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+	const QRect screen_rect = QApplication::screenAt(point_)->availableGeometry();
+#else
 	const QRect screen_rect = QApplication::desktop()->availableGeometry(
 		QApplication::desktop()->screenNumber(point_));
+#endif
 
 	if (pos_ == Right || pos_ == Left)
 		o.ry() = -height() / 2;