X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewitem.cpp;h=e9602f8790ddcec61767509cd694524cbd3d8cd6;hp=b3498ac159434ea6d36c2404bcedcca025e52d52;hb=f765c3db91d60e9b038ee05f2fa6acc8587d8470;hpb=d4e39570ee6021766c375654801dddba45b9198a

diff --git a/pv/view/viewitem.cpp b/pv/view/viewitem.cpp
index b3498ac1..e9602f87 100644
--- a/pv/view/viewitem.cpp
+++ b/pv/view/viewitem.cpp
@@ -29,12 +29,13 @@
 namespace pv {
 namespace view {
 
-const int ViewItem::HighlightRadius = 6;
+const QSizeF ViewItem::LabelPadding(4, 0);
+const int ViewItem::HighlightRadius = 3;
 
 ViewItem::ViewItem() :
-	context_parent_(NULL),
-	selected_(false),
-	drag_point_(INT_MIN, INT_MIN)
+	context_parent_(nullptr),
+	drag_point_(INT_MIN, INT_MIN),
+	selected_(false)
 {
 }
 
@@ -48,19 +49,20 @@ void ViewItem::select(bool select)
 	selected_ = select;
 }
 
-bool ViewItem::dragging() const
+bool ViewItem::is_draggable() const
 {
-	return drag_point_.x() != INT_MIN && drag_point_.y() != INT_MIN;
+	return true;
 }
 
-QPoint ViewItem::drag_point() const
+bool ViewItem::dragging() const
 {
-	return drag_point_;
+	return drag_point_.x() != INT_MIN && drag_point_.y() != INT_MIN;
 }
 
 void ViewItem::drag()
 {
-	drag_point_ = point();
+	if (is_draggable())
+		drag_point_ = point(QRect());
 }
 
 void ViewItem::drag_release()
@@ -68,12 +70,30 @@ void ViewItem::drag_release()
 	drag_point_ = QPoint(INT_MIN, INT_MIN);
 }
 
+QRectF ViewItem::label_rect(const QRectF &rect) const
+{
+	(void)rect;
+	return QRectF();
+}
+
+QRectF ViewItem::hit_box_rect(const ViewItemPaintParams &pp) const
+{
+	(void)pp;
+	return QRectF();
+}
+
 QMenu* ViewItem::create_context_menu(QWidget *parent)
 {
 	context_parent_ = parent;
 	return new QMenu(parent);
 }
 
+widgets::Popup* ViewItem::create_popup(QWidget *parent)
+{
+	(void)parent;
+	return nullptr;
+}
+
 void ViewItem::delete_pressed()
 {
 }
@@ -81,10 +101,17 @@ void ViewItem::delete_pressed()
 QPen ViewItem::highlight_pen()
 {
 	return QPen(QApplication::palette().brush(
-		QPalette::Highlight), HighlightRadius,
+		QPalette::Highlight), HighlightRadius * 2,
 		Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
 }
 
+void ViewItem::paint_label(QPainter &p, const QRect &rect, bool hover)
+{
+	(void)p;
+	(void)rect;
+	(void)hover;
+}
+
 void ViewItem::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {
 	(void)p;
@@ -105,7 +132,7 @@ void ViewItem::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
 
 QColor ViewItem::select_text_colour(QColor background)
 {
-	return (background.lightness() > 64) ? Qt::black : Qt::white;
+	return (background.lightness() > 110) ? Qt::black : Qt::white;
 }
 
 } // namespace view