Make traces non-draggable outside the header area

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index f7bba9ff31506e5a5fa68abaacfe1fe3163e321e..f7e7ebf25b8ec00a351bb415f7fe696de155e8b6 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -80,6 +80,17 @@ void Trace::set_coloured_bg(bool state)
        coloured_bg_ = state;
 }
 
        coloured_bg_ = state;
 }
 

+bool Trace::is_draggable() const
+{
+       const View *const view = owner_->view();
+       assert(view);
+
+       QPoint cursor_pos = view->mapFromGlobal(QCursor::pos());
+
+       // The signal is draggable only in the header area
+       return (cursor_pos.x() <= view->header_size().width());
+}
+

 void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
        const int y = get_visual_y();
 void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
        const int y = get_visual_y();

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index c9582c61218409616c7119d1cc894f6ae0cecafd..acaa341adbadd55f477e32d1f3e01d9cd4c662f6 100644 (file)
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -81,6 +81,11 @@ public:
         */
        void set_coloured_bg(bool state);
 
         */
        void set_coloured_bg(bool state);
 

+       /**
+        * Returns true if the item may be dragged/moved.
+        */
+       bool is_draggable() const;
+

        /**
         * Computes the outline rectangle of the viewport hit-box.
         * @param rect the rectangle of the viewport area.
        /**
         * Computes the outline rectangle of the viewport hit-box.
         * @param rect the rectangle of the viewport area.

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index c9b08bf8c0445de0783d5bbb16d4d4275f5066f1..124048bda8f9c63c1b14a5e770977ab89e09e37c 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -203,6 +203,11 @@ const Viewport* View::viewport() const
        return viewport_;
 }
 
        return viewport_;
 }
 

+const QSize View::header_size() const
+{
+       return header_->sizeHint();
+}
+

 vector< shared_ptr<TimeItem> > View::time_items() const
 {
        const vector<shared_ptr<Flag>> f(flags());
 vector< shared_ptr<TimeItem> > View::time_items() const
 {
        const vector<shared_ptr<Flag>> f(flags());

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 635273dae74ad6e1131a592da699beba6a8e76e7..8aa551250177199a297d73998b01fab1bd8a79f5 100644 (file)
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -95,6 +95,8 @@ public:
 
        const Viewport* viewport() const;
 
 
        const Viewport* viewport() const;
 

+       const QSize header_size() const;
+

        /**
         * Gets a list of time markers.
         */
        /**
         * Gets a list of time markers.
         */