Fixed Header to respect the minimum drag distance

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index b85b1bb1c0a03cc5ed11249d0e4dd96df2865d26..549b71918627b4bd1a6d0e01f2e20f6fe17994f6 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -29,8 +29,6 @@
 #include <boost/foreach.hpp>
 
 #include <QApplication>
-#include <QColorDialog>
-#include <QInputDialog>
 #include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
@@ -44,16 +42,10 @@ namespace view {
 
 Header::Header(View &parent) :
        MarginWidget(parent),
-       _action_set_name(new QAction(tr("Set &Name..."), this)),
-       _action_set_colour(new QAction(tr("Set &Colour..."), this))
+       _dragging(false)
 {
        setMouseTracking(true);
 
-       connect(_action_set_name, SIGNAL(triggered()),
-               this, SLOT(on_action_set_name_triggered()));
-       connect(_action_set_colour, SIGNAL(triggered()),
-               this, SLOT(on_action_set_colour_triggered()));
-
        connect(&_view.session(), SIGNAL(signals_changed()),
                this, SLOT(on_signals_changed()));
 
@@ -161,6 +153,7 @@ void Header::mouseReleaseEvent(QMouseEvent *event)
 {
        assert(event);
        if (event->button() == Qt::LeftButton) {
+               _dragging = false;
                _drag_traces.clear();
                _view.normalize_layout();
        }
@@ -171,8 +164,18 @@ void Header::mouseMoveEvent(QMouseEvent *event)
        assert(event);
        _mouse_point = event->pos();
 
+       if (!(event->buttons() & Qt::LeftButton))
+               return;
+
+       if ((event->pos() - _mouse_down_point).manhattanLength() <
+               QApplication::startDragDistance())
+               return;
+
        // Move the signals if we are dragging
-       if (!_drag_traces.empty()) {
+       if (!_drag_traces.empty())
+       {
+               _dragging = true;
+
                const int delta = event->pos().y() - _mouse_down_point.y();
 
                for (std::list<std::pair<boost::weak_ptr<Trace>,
@@ -209,44 +212,8 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 {
        const shared_ptr<Trace> t = get_mouse_over_trace(_mouse_point);
 
-       if (!t)
-               return;
-
-       QMenu menu(this);
-       menu.addAction(_action_set_name);
-       menu.addAction(_action_set_colour);
-
-       _context_trace = t;
-       menu.exec(event->globalPos());
-       _context_trace.reset();
-}
-
-void Header::on_action_set_name_triggered()
-{
-       bool ok = false;
-
-       shared_ptr<view::Trace> context_trace = _context_trace;
-       if (!context_trace)
-               return;
-
-       const QString new_label = QInputDialog::getText(this, tr("Set Name"),
-               tr("Name"), QLineEdit::Normal, context_trace->get_name(), &ok);
-
-       if (ok)
-               context_trace->set_name(new_label);
-}
-
-void Header::on_action_set_colour_triggered()
-{
-       shared_ptr<view::Trace> context_trace = _context_trace;
-       if (!context_trace)
-               return;
-
-       const QColor new_colour = QColorDialog::getColor(
-               context_trace->get_colour(), this, tr("Set Colour"));
-
-       if (new_colour.isValid())
-               context_trace->set_colour(new_colour);
+       if (t)
+               t->create_context_menu(this)->exec(event->globalPos());
 }
 
 void Header::on_signals_changed()