X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fmarginwidget.hpp;h=963d71712ac67a22e9ecdb77eb01c51fce3e1dc7;hp=b8bcdd77744f2e7676cdbb3a25d1eff9e321c852;hb=3370799041d0ee09bf1c7c4f006933778579c037;hpb=04b623e04f224748248447d8b3ced2df050a3375

diff --git a/pv/view/marginwidget.hpp b/pv/view/marginwidget.hpp
index b8bcdd77..963d7171 100644
--- a/pv/view/marginwidget.hpp
+++ b/pv/view/marginwidget.hpp
@@ -18,21 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_MARGINWIDGET_H
-#define PULSEVIEW_PV_MARGINWIDGET_H
+#ifndef PULSEVIEW_PV_MARGINWIDGET_HPP
+#define PULSEVIEW_PV_MARGINWIDGET_HPP
 
 #include <memory>
 
 #include <QPoint>
-#include <QWidget>
+
+#include "viewwidget.hpp"
 
 namespace pv {
 namespace view {
 
-class View;
 class ViewItem;
 
-class MarginWidget : public QWidget
+class MarginWidget : public ViewWidget
 {
 	Q_OBJECT
 
@@ -48,18 +48,11 @@ public:
 
 protected:
 	/**
-	 * Gets the items in the margin widget.
-	 */
-	virtual std::vector< std::shared_ptr<pv::view::ViewItem> > items() = 0;
-
-	/**
-	 * Gets the first view item which has a label that contains @c pt .
-	 * @param pt the point to search with.
-	 * @return the view item that has been found, or and empty
-	 *   @c shared_ptr if no item was found.
+	 * Indicates the event an a view item has been clicked.
+	 * @param item the view item that has been clicked.
 	 */
-	virtual std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
-		const QPoint &pt) = 0;
+	virtual void item_clicked(
+		const std::shared_ptr<pv::view::ViewItem> &item);
 
 	/**
 	 * Shows the popup of a the specified @c ViewItem .
@@ -67,24 +60,13 @@ protected:
 	 */
 	void show_popup(const std::shared_ptr<ViewItem> &item);
 
-private:
-	void leaveEvent(QEvent *event);
-
-public Q_SLOTS:
-	virtual void clear_selection();
-
-Q_SIGNALS:
-	void selection_changed();
-
 protected:
-	pv::view::View &view_;
-	QPoint mouse_point_;
-	QPoint mouse_down_point_;
-	std::shared_ptr<ViewItem> mouse_down_item_;
-	bool dragging_;
+	virtual void contextMenuEvent(QContextMenuEvent *event);
+
+	virtual void keyPressEvent(QKeyEvent *e);
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MARGINWIDGET_H
+#endif // PULSEVIEW_PV_MARGINWIDGET_HPP