X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewitem.hpp;h=5b80c4e86efdb8fe3e9a95320bcd3aa232cd65a4;hp=3e6801fe3186dffe74c10263f27b4192e95ef871;hb=0f2f14a4307b1c5952e3cb683e5049ae33c0da1b;hpb=49028d6c2d8aaf61b528e2dfb7ad3fe1ccb7169e

diff --git a/pv/view/viewitem.hpp b/pv/view/viewitem.hpp
index 3e6801f..5b80c4e 100644
--- a/pv/view/viewitem.hpp
+++ b/pv/view/viewitem.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEWITEM_H
-#define PULSEVIEW_PV_VIEWITEM_H
+#ifndef PULSEVIEW_PV_VIEWITEM_HPP
+#define PULSEVIEW_PV_VIEWITEM_HPP
 
 #include <list>
 
@@ -44,6 +44,7 @@ class ViewItem : public QObject
 	Q_OBJECT
 
 public:
+	static const QSizeF LabelPadding;
 	static const int HighlightRadius;
 
 public:
@@ -70,11 +71,6 @@ public:
 	 */
 	bool dragging() const;
 
-	/**
-	 * Retunrns the current drag point.
-	 */
-	QPoint drag_point() const;
-
 	/**
 	 * Sets this item into the dragged state.
 	 */
@@ -85,10 +81,17 @@ public:
 	 */
 	void drag_release();
 
+	/**
+	 * Drags the item to a delta relative to the drag point.
+	 * @param delta the offset from the drag point.
+	 */
+	virtual void drag_by(const QPoint &delta) = 0;
+
 	/**
 	 * Get the drag point.
+	 * @param rect the rectangle of the widget area.
 	 */
-	virtual QPoint point() const = 0;
+	virtual QPoint point(const QRect &rect) const = 0;
 
 	/**
 	 * Computes the outline rectangle of a label.
@@ -97,6 +100,14 @@ public:
 	 */
 	virtual QRectF label_rect(const QRectF &rect) const = 0;
 
+	/**
+	 * Computes the outline rectangle of the viewport hit-box.
+	 * @param rect the rectangle of the viewport area.
+	 * @return Returns the rectangle of the hit-box.
+	 * @remarks The default implementation returns an empty hit-box.
+	 */
+	virtual QRectF hit_box_rect(const QRectF &rect) const;
+
 	/**
 	 * Paints the signal label.
 	 * @param p the QPainter to paint into.
@@ -138,7 +149,7 @@ public:
 public:
 	virtual QMenu* create_context_menu(QWidget *parent);
 
-	virtual pv::widgets::Popup* create_popup(QWidget *parent) = 0;
+	virtual pv::widgets::Popup* create_popup(QWidget *parent);
 
 	virtual void delete_pressed();
 
@@ -147,13 +158,13 @@ protected:
 
 protected:
 	QWidget *context_parent_;
+	QPoint drag_point_;
 
 private:
 	bool selected_;
-	QPoint drag_point_;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWITEM_H
+#endif // PULSEVIEW_PV_VIEWITEM_HPP