X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=5f1de744a1d7e5642d6f364f66672f1020aa7a12;hb=30fcfd9f5b348da5123f0a25c943e40209be95b1;hp=a141b6164754f79760fc27c291d0054b48245da6;hpb=fdf5ff04d8687ac67767267e9b440a2b5d37defd;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index a141b61..5f1de74 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -54,14 +54,17 @@ 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(
 	const QPoint &pt)
 {
 	const int w = width();
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
+	const vector< shared_ptr<Signal> > sigs(
+		_view.session().get_signals());
 
 	const int v_offset = _view.v_offset();
 	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
@@ -82,8 +85,8 @@ boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
 void Header::paintEvent(QPaintEvent *event)
 {
 	const int w = width();
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
+	const vector< shared_ptr<Signal> > sigs(
+		_view.session().get_signals());
 
 	QPainter painter(this);
 	painter.setRenderHint(QPainter::Antialiasing);
@@ -110,16 +113,8 @@ void Header::mousePressEvent(QMouseEvent *event)
 {
 	assert(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);
-	}
+	const vector< shared_ptr<Signal> > sigs(
+		_view.session().get_signals());
 
 	if(event->button() & Qt::LeftButton) {
 		_mouse_down_point = event->pos();
@@ -140,21 +135,36 @@ 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();
 }
 
 void Header::mouseReleaseEvent(QMouseEvent *event)
 {
 	assert(event);
-	if(event->button() == Qt::LeftButton)
+	if(event->button() == Qt::LeftButton) {
 		_drag_sigs.clear();
+		_view.normalize_layout();
+	}
 }
 
 void Header::mouseMoveEvent(QMouseEvent *event)
@@ -238,5 +248,11 @@ void Header::on_action_set_colour_triggered()
 		context_signal->set_colour(new_colour);
 }
 
+void Header::on_signals_moved()
+{
+	update();
+}
+
+
 } // namespace view
 } // namespace pv