X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=3ec75fc307ed7df0ec6d0b2e9a132510e32d2996;hb=ef454ad5cf454ae2da91b45219e1be2e010d8312;hp=a8cf63540a0cb239645b1cb3e4e5131743caac1e;hpb=2f7982367e8382e05c862de7afc71075ded5f606;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index a8cf635..3ec75fc 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -83,19 +83,6 @@ shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
 	return nullptr;
 }
 
-bool Ruler::accept_drag() const
-{
-	return true;
-}
-
-void Ruler::drag_items(const QPoint &delta)
-{
-	const vector< shared_ptr<TimeItem> > items(view_.time_items());
-	for (auto &i : items)
-		if (i->dragging())
-			i->drag_by(delta);
-}
-
 void Ruler::paintEvent(QPaintEvent*)
 {
 	const int ValueMargin = 3;
@@ -135,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, view_.time_unit()));
 			p.drawLine(QPointF(x, major_tick_y1),
 				QPointF(x, ruler_height));
 		}
@@ -161,7 +148,7 @@ 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);
 	}