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 b833b4bbad0c19d2ea3afd6974381e35ecdf82fd..02a9c6a2f39d8deb9dcb0e0c4d3f11e1b1f16a93 100644 (file)
--- a/pv/view/viewitem.cpp
+++ b/pv/view/viewitem.cpp
@@ -29,12 +29,13 @@
 namespace pv {
 namespace view {
 
 namespace pv {
 namespace view {
 

+const QSizeF ViewItem::LabelPadding(4, 0);

 const int ViewItem::HighlightRadius = 3;
 
 ViewItem::ViewItem() :
        context_parent_(NULL),
 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;
 }
 
        return drag_point_.x() != INT_MIN && drag_point_.y() != INT_MIN;
 }
 

-QPoint ViewItem::drag_point() const
-{
-       return drag_point_;
-}
-

 void ViewItem::drag()
 {
 void ViewItem::drag()
 {

-       drag_point_ = point();
+       drag_point_ = point(QRect());

 }
 
 void ViewItem::drag_release()
 }
 
 void ViewItem::drag_release()