X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=2f9b140eec8d0f9d1649155166b89f3a0638e5cd;hp=b847d2c82a5c25408f0cc561a9bc35cd20c0e9ea;hb=f9abacf20c85333a3a6be785049e7658967e3104;hpb=6a2cc8dd37f6d128ad7e16b9a7a78bb44d5a5aa5

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index b847d2c8..2f9b140e 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -148,66 +148,17 @@ void Ruler::paintEvent(QPaintEvent*)
 	// Draw the items
 	const vector< shared_ptr<TimeItem> > items(view_.time_items());
 	for (auto &i : items) {
-		const bool highlight = !dragging_ &&
+		const bool highlight = !item_dragging_ &&
 			i->label_rect(r).contains(mouse_point_);
 		i->paint_label(p, r, highlight);
 	}
 }
 
-void Ruler::mouseMoveEvent(QMouseEvent *e)
-{
-	mouse_point_ = e->pos();
-
-	if (!(e->buttons() & Qt::LeftButton))
-		return;
-
-	if ((e->pos() - mouse_down_point_).manhattanLength() <
-		QApplication::startDragDistance())
-		return;
-
-	// Do the drag
-	dragging_ = true;
-
-	const QPoint delta = e->pos() - mouse_down_point_;
-	const vector< shared_ptr<TimeItem> > items(view_.time_items());
-	for (auto &i : items)
-		if (i->dragging())
-			i->drag_by(delta);
-}
-
-void Ruler::mouseReleaseEvent(QMouseEvent *)
-{
-	using pv::widgets::Popup;
-
-	if (!dragging_ && mouse_down_item_)
-		show_popup(mouse_down_item_);
-
-	dragging_ = false;
-	mouse_down_item_.reset();
-
-	const vector< shared_ptr<TimeItem> > items(view_.time_items());
-	for (auto &i : items)
-		i->drag_release();
-}
-
 void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
 {
 	view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
 }
 
-void Ruler::keyPressEvent(QKeyEvent *e)
-{
-	assert(e);
-
-	if (e->key() == Qt::Key_Delete)
-	{
-		const vector< shared_ptr<TimeItem> > items(view_.time_items());
-		for (auto &i : items)
-			if (i->selected())
-				i->delete_pressed();
-	}
-}
-
 void Ruler::draw_hover_mark(QPainter &p, int text_height)
 {
 	const int x = view_.hover_point().x();