ViewItem: Use drag_point() with drag_by()

[pulseview.git] / pv / view / viewitem.cpp

diff --git a/pv/view/viewitem.cpp b/pv/view/viewitem.cpp
index 0d83ee846f01547f609c91fac8a8c85f4b566208..02a9c6a2f39d8deb9dcb0e0c4d3f11e1b1f16a93 100644 (file)
--- 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)
+       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()
@@ -81,10 +77,28 @@ 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_back(QPainter &p, const ViewItemPaintParams &pp)
+{
+       (void)p;
+       (void)pp;
+}
+
+void ViewItem::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
+{
+       (void)p;
+       (void)pp;
+}
+
+void ViewItem::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+       (void)p;
+       (void)pp;
+}
+
 QColor ViewItem::select_text_colour(QColor background)
 {
        return (background.lightness() > 64) ? Qt::black : Qt::white;