X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewitem.hpp;h=a4eb6aef30423a79beefa6fa616357cdb8f3a483;hp=1e02ffde289514bac8bf816aef3532ea46630e5f;hb=0c2389230c90d8bf34b601c625bcf655b24e8f52;hpb=ec39632d1267a42cb858ac6ad7c98486886a46a0

diff --git a/pv/view/viewitem.hpp b/pv/view/viewitem.hpp
index 1e02ffde..a4eb6aef 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>
 
@@ -39,6 +39,8 @@ class Popup;
 
 namespace view {
 
+class ViewItemOwner;
+
 class ViewItem : public QObject
 {
 	Q_OBJECT
@@ -64,17 +66,17 @@ public:
 	/**
 	 * Selects or deselects the signal.
 	 */
-	void select(bool select = true);
+	virtual void select(bool select = true);
 
 	/**
-	 * Returns true if the item is being dragged.
+	 * Returns true if the item may be dragged/moved.
 	 */
-	bool dragging() const;
+	virtual bool is_draggable() const;
 
 	/**
-	 * Retunrns the current drag point.
+	 * Returns true if the item is being dragged.
 	 */
-	QPoint drag_point() const;
+	bool dragging() const;
 
 	/**
 	 * Sets this item into the dragged state.
@@ -84,19 +86,35 @@ public:
 	/**
 	 * Sets this item into the un-dragged state.
 	 */
-	void drag_release();
+	virtual 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.
 	 * @param rect the rectangle of the header area.
 	 * @return Returns the rectangle of the signal label.
+	 * @remarks The default implementation returns an empty rectangle.
 	 */
-	virtual QRectF label_rect(const QRectF &rect) const = 0;
+	virtual QRectF label_rect(const QRectF &rect) const;
+
+	/**
+	 * 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 ViewItemPaintParams &pp) const;
 
 	/**
 	 * Paints the signal label.
@@ -104,27 +122,27 @@ public:
 	 * @param rect the rectangle of the header area.
 	 * @param hover true if the label is being hovered over by the mouse.
 	 */
-	virtual void paint_label(QPainter &p, const QRect &rect, bool hover) = 0;
+	virtual void paint_label(QPainter &p, const QRect &rect, bool hover);
 
 	/**
 	 * Paints the background layer of the item with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
-	 **/
+	 */
 	virtual void paint_back(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the mid-layer of the item with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
-	 **/
+	 */
 	virtual void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the foreground layer of the item with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
-	 **/
+	 */
 	virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
 public:
@@ -139,7 +157,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();
 
@@ -148,13 +166,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