Fix item dragging

[pulseview.git] / pv / views / trace / viewitem.cpp

diff --git a/pv/views/trace/viewitem.cpp b/pv/views/trace/viewitem.cpp
index 445f17958b06719ccdd66f66a2afc43c00b2ae83..2dd8ade8c1fddb03c718c79179c4161c278dc461 100644 (file)
--- a/pv/views/trace/viewitem.cpp
+++ b/pv/views/trace/viewitem.cpp
@@ -39,6 +39,12 @@ ViewItem::ViewItem() :
 {
 }
 
 {
 }
 

+bool ViewItem::is_selectable(QPoint pos) const
+{
+       (void)pos;
+       return true;
+}
+

 bool ViewItem::selected() const
 {
        return selected_;
 bool ViewItem::selected() const
 {
        return selected_;


@@ -49,8 +55,9 @@ void ViewItem::select(bool select)
        selected_ = select;
 }
 
        selected_ = select;
 }
 

-bool ViewItem::is_draggable() const
+bool ViewItem::is_draggable(QPoint pos) const

 {
 {

+       (void)pos;

        return true;
 }
 
        return true;
 }
 


@@ -61,8 +68,7 @@ bool ViewItem::dragging() const
 
 void ViewItem::drag()
 {
 
 void ViewItem::drag()
 {

-       if (is_draggable())
-               drag_point_ = drag_point(QRect());
+       drag_point_ = drag_point(QRect());

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


@@ -82,12 +88,19 @@ QRectF ViewItem::hit_box_rect(const ViewItemPaintParams &pp) const
        return QRectF();
 }
 
        return QRectF();
 }
 

-QMenu* ViewItem::create_context_menu(QWidget *parent)
+QMenu* ViewItem::create_header_context_menu(QWidget *parent)

 {
        context_parent_ = parent;
        return new QMenu(parent);
 }
 
 {
        context_parent_ = parent;
        return new QMenu(parent);
 }
 

+QMenu* ViewItem::create_view_context_menu(QWidget *parent, QPoint &click_pos)
+{
+       (void)parent;
+       (void)click_pos;
+       return nullptr;
+}
+

 widgets::Popup* ViewItem::create_popup(QWidget *parent)
 {
        (void)parent;
 widgets::Popup* ViewItem::create_popup(QWidget *parent)
 {
        (void)parent;


@@ -130,7 +143,7 @@ void ViewItem::paint_fore(QPainter &p, ViewItemPaintParams &pp)
        (void)pp;
 }
 
        (void)pp;
 }
 

-QColor ViewItem::select_text_colour(QColor background)
+QColor ViewItem::select_text_color(QColor background)

 {
        return (background.lightness() > 110) ? Qt::black : Qt::white;
 }
 {
        return (background.lightness() > 110) ? Qt::black : Qt::white;
 }