X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=pv%2Fwidgets%2Fpopup.hpp;h=879c5f9d83542e3a4fc50485441554cabdc9ea24;hb=0466001be51e779b23aaebec1cc9361305c07be9;hp=84def1fe90eee3171a4914a0cc4157e47c85de5d;hpb=d9ea96280ab1128427143660ae375c30b19aa0cb;p=pulseview.git
diff --git a/pv/widgets/popup.hpp b/pv/widgets/popup.hpp
index 84def1fe..879c5f9d 100644
--- a/pv/widgets/popup.hpp
+++ b/pv/widgets/popup.hpp
@@ -14,18 +14,35 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_WIDGETS_POPUP_HPP
#define PULSEVIEW_PV_WIDGETS_POPUP_HPP
+#include
#include
namespace pv {
namespace widgets {
+
+// A regular QScrollArea has a fixed size and provides scroll bars when the
+// content can't be shown in its entirety. However, we want no horizontal
+// scroll bar and want the scroll area to adjust its width to fit the content
+// instead.
+// Inspired by https://stackoverflow.com/questions/21253755/qscrollarea-with-dynamically-changing-contents?answertab=votes#tab-top
+class QWidthAdjustingScrollArea : public QScrollArea
+{
+ Q_OBJECT
+
+public:
+ QWidthAdjustingScrollArea(QWidget* parent = nullptr);
+ void setWidget(QWidget* w);
+ bool eventFilter(QObject* obj, QEvent* ev);
+};
+
+
class Popup : public QWidget
{
Q_OBJECT
@@ -54,7 +71,7 @@ public:
bool eventFilter(QObject *obj, QEvent *event);
- void show();
+ virtual void show();
private:
bool space_for_arrow() const;