X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=f25bcb8fc8fc3fabb8d2f929acc9af51775cbf2d;hb=96b6316ab8ed24551a0affb7a5819d1c97147a5c;hp=0d86efd853202b0bf2753c91eff0344e5848478b;hpb=e47b69882ca7299041123c664dbcc8b552c5db99;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 0d86efd..f25bcb8 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -122,7 +122,7 @@ void Ruler::paintEvent(QPaintEvent*)
 			// Draw a major tick
 			p.drawText(x, ValueMargin, 0, text_height,
 				AlignCenter | AlignTop | TextDontClip,
-				pv::util::format_time(t, prefix));
+				util::format_time(t, prefix));
 			p.drawLine(QPointF(x, major_tick_y1),
 				QPointF(x, ruler_height));
 		}
@@ -148,33 +148,12 @@ 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::mouseDoubleClickEvent(QMouseEvent *e)
 {
 	view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());