X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=e167bffc5c8e38535e82d94692bf96a8193de8f2;hb=8d44d030c3923055f2ea81d5334d3a3bce7900c2;hp=e50d851f686d315bc584f5e92510218b85f3ad08;hpb=da2bebfb824ac5328ef2a22121a4041d0dc37431;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index e50d851f..e167bffc 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -54,6 +54,9 @@ Header::Header(View &parent) :
 		this, SLOT(on_action_set_name_triggered()));
 	connect(_action_set_colour, SIGNAL(triggered()),
 		this, SLOT(on_action_set_colour_triggered()));
+
+	connect(&_view, SIGNAL(signals_moved()),
+		this, SLOT(on_signals_moved()));
 }
 
 boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
@@ -89,6 +92,7 @@ void Header::paintEvent(QPaintEvent *event)
 	painter.setRenderHint(QPainter::Antialiasing);
 
 	const int v_offset = _view.v_offset();
+	const bool dragging = !_drag_sigs.empty();
 	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
 	{
 		assert(s);
@@ -97,8 +101,9 @@ void Header::paintEvent(QPaintEvent *event)
 			0, s->get_v_offset() - v_offset,
 			w, View::SignalHeight);
 
-		s->paint_label(painter, signal_heading_rect,
-			s->pt_in_label_rect(signal_heading_rect, _mouse_point));
+		const bool highlight = !dragging && s->pt_in_label_rect(
+			signal_heading_rect, _mouse_point);
+		s->paint_label(painter, signal_heading_rect, highlight);
 	}
 
 	painter.end();
@@ -111,14 +116,6 @@ void Header::mousePressEvent(QMouseEvent *event)
 	const vector< shared_ptr<Signal> > &sigs =
 		_view.session().get_signals();
 
-	if(~QApplication::keyboardModifiers() & Qt::ControlModifier) {
-		// Unselect all other signals because the Ctrl is not
-		// pressed
-		_drag_sigs.clear();
-		BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-			s->select(false);
-	}
-
 	if(event->button() & Qt::LeftButton) {
 		_mouse_down_point = event->pos();
 
@@ -138,13 +135,26 @@ void Header::mousePressEvent(QMouseEvent *event)
 		else {
 			mouse_over_signal->select(true);
 
+			if(~QApplication::keyboardModifiers() &
+				Qt::ControlModifier)
+				_drag_sigs.clear();
+
 			// Add the signal to the drag list
-			_drag_sigs.push_back(
-				make_pair(mouse_over_signal,
+			if(event->button() & Qt::LeftButton)
+				_drag_sigs.push_back(
+					make_pair(mouse_over_signal,
 					mouse_over_signal->get_v_offset()));
 		}
 	}
 
+	if(~QApplication::keyboardModifiers() & Qt::ControlModifier) {
+		// Unselect all other signals because the Ctrl is not
+		// pressed
+		BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+			if(s != mouse_over_signal)
+				s->select(false);
+	}
+
 	update();
 }
 
@@ -236,5 +246,11 @@ void Header::on_action_set_colour_triggered()
 		context_signal->set_colour(new_colour);
 }
 
+void Header::on_signals_moved()
+{
+	update();
+}
+
+
 } // namespace view
 } // namespace pv