projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewWidget: Moved in drag_items
[pulseview.git]
/
pv
/
view
/
marginwidget.hpp
diff --git
a/pv/view/marginwidget.hpp
b/pv/view/marginwidget.hpp
index 35d557d10ccab7dcae57f57f6c990bce7c85e9d6..029d68e5214970d700c4e3e0240b8c79935044ba 100644
(file)
--- a/
pv/view/marginwidget.hpp
+++ b/
pv/view/marginwidget.hpp
@@
-24,15
+24,15
@@
#include <memory>
#include <QPoint>
#include <memory>
#include <QPoint>
-#include <QWidget>
+
+#include "viewwidget.hpp"
namespace pv {
namespace view {
namespace pv {
namespace view {
-class View;
class ViewItem;
class ViewItem;
-class MarginWidget : public
Q
Widget
+class MarginWidget : public
View
Widget
{
Q_OBJECT
{
Q_OBJECT
@@
-82,6
+82,7
@@
protected:
protected:
void mousePressEvent(QMouseEvent * event);
void mouseReleaseEvent(QMouseEvent *event);
protected:
void mousePressEvent(QMouseEvent * event);
void mouseReleaseEvent(QMouseEvent *event);
+ void mouseMoveEvent(QMouseEvent *event);
void leaveEvent(QEvent *event);
void leaveEvent(QEvent *event);
@@
-96,7
+97,6
@@
Q_SIGNALS:
void selection_changed();
protected:
void selection_changed();
protected:
- pv::view::View &view_;
QPoint mouse_point_;
QPoint mouse_down_point_;
std::shared_ptr<ViewItem> mouse_down_item_;
QPoint mouse_point_;
QPoint mouse_down_point_;
std::shared_ptr<ViewItem> mouse_down_item_;