X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=ca5df96fca250dc23666bbdcf59f644a07083139;hp=549b71918627b4bd1a6d0e01f2e20f6fe17994f6;hb=27e8df221014d1a8c7769866773e8dbb0486eea8;hpb=728fcafc9897d3ffb4a109b6248d88b0945128f5

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 549b7191..ca5df96f 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -34,16 +34,21 @@
 #include <QPainter>
 #include <QRect>
 
+#include <pv/widgets/popup.h>
+
 using namespace boost;
 using namespace std;
 
 namespace pv {
 namespace view {
 
+const int Header::Padding = 12;
+
 Header::Header(View &parent) :
 	MarginWidget(parent),
 	_dragging(false)
 {
+	setFocusPolicy(Qt::ClickFocus);
 	setMouseTracking(true);
 
 	connect(&_view.session(), SIGNAL(signals_changed()),
@@ -53,6 +58,19 @@ Header::Header(View &parent) :
 		this, SLOT(on_signals_moved()));
 }
 
+QSize Header::sizeHint() const
+{
+	int max_width = 0;
+
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+		assert(t);
+		max_width = max(max_width, (int)t->get_label_rect(0).width());
+	}
+
+	return QSize(max_width + Padding, 0);
+}
+
 shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
 {
 	const int w = width();
@@ -151,11 +169,28 @@ void Header::mousePressEvent(QMouseEvent *event)
 
 void Header::mouseReleaseEvent(QMouseEvent *event)
 {
+	using pv::widgets::Popup;
+
 	assert(event);
 	if (event->button() == Qt::LeftButton) {
+		if (_dragging)
+			_view.normalize_layout();
+		else
+		{
+			const shared_ptr<Trace> mouse_over_trace =
+				get_mouse_over_trace(event->pos());
+			if (mouse_over_trace) {
+				Popup *const p =
+					mouse_over_trace->create_popup(&_view);
+				p->set_position(mapToGlobal(QPoint(width(),
+					mouse_over_trace->get_y())),
+					Popup::Right);
+				p->show();
+			}
+		}
+
 		_dragging = false;
 		_drag_traces.clear();
-		_view.normalize_layout();
 	}
 }
 
@@ -216,12 +251,34 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 		t->create_context_menu(this)->exec(event->globalPos());
 }
 
+void Header::keyPressEvent(QKeyEvent *e)
+{
+	assert(e);
+
+	switch (e->key())
+	{
+	case Qt::Key_Delete:
+	{
+		const vector< shared_ptr<Trace> > traces(_view.get_traces());
+		BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+			if (t->selected())
+				t->delete_pressed();	
+		break;
+	}
+	}
+}
+
 void Header::on_signals_changed()
 {
 	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
 		assert(t);
-		connect(t.get(), SIGNAL(text_changed()), this, SLOT(update()));
+		connect(t.get(), SIGNAL(visibility_changed()),
+			this, SLOT(update()));
+		connect(t.get(), SIGNAL(text_changed()),
+			this, SLOT(on_trace_text_changed()));
+		connect(t.get(), SIGNAL(colour_changed()),
+			this, SLOT(update()));
 	}
 }
 
@@ -230,6 +287,11 @@ void Header::on_signals_moved()
 	update();
 }
 
+void Header::on_trace_text_changed()
+{
+	update();
+	geometry_updated();
+}
 
 } // namespace view
 } // namespace pv