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

diff --git a/pv/view/viewitem.cpp b/pv/view/viewitem.cpp
index b3498ac1..55243860 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)
 {
 }
 
@@ -53,14 +54,9 @@ bool ViewItem::dragging() const
 	return drag_point_.x() != INT_MIN && drag_point_.y() != INT_MIN;
 }
 
-QPoint ViewItem::drag_point() const
-{
-	return drag_point_;
-}
-
 void ViewItem::drag()
 {
-	drag_point_ = point();
+	drag_point_ = point(QRect());
 }
 
 void ViewItem::drag_release()
@@ -68,6 +64,12 @@ void ViewItem::drag_release()
 	drag_point_ = QPoint(INT_MIN, INT_MIN);
 }
 
+QRectF ViewItem::hit_box_rect(const QRectF &rect) const
+{
+	(void)rect;
+	return QRectF();
+}
+
 QMenu* ViewItem::create_context_menu(QWidget *parent)
 {
 	context_parent_ = parent;
@@ -81,7 +83,7 @@ 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);
 }