X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=6d016fe0b441aa832a504e64704fd564ac67d59c;hb=de1d99bbe58f825e30048baa48a9439c01686f10;hp=63679012a52947d92b7d1fc67f40948a042f339b;hpb=333d5bbc0a326e6fa82db44f3e6ba8dd79cafdd8;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 63679012..6d016fe0 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -71,18 +71,15 @@ boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
 	{
 		assert(s);
 
-		const QRect signal_heading_rect(
-			0, s->get_v_offset() - v_offset,
-			w, View::SignalHeight);
-
-		if (s->pt_in_label_rect(signal_heading_rect, pt))
+		if (s->pt_in_label_rect(s->get_v_offset() - v_offset,
+			0, w, pt))
 			return s;
 	}
 
 	return shared_ptr<Signal>();
 }
 
-void Header::paintEvent(QPaintEvent *event)
+void Header::paintEvent(QPaintEvent*)
 {
 	const int w = width();
 	const vector< shared_ptr<Signal> > sigs(
@@ -97,13 +94,10 @@ void Header::paintEvent(QPaintEvent *event)
 	{
 		assert(s);
 
-		const QRect signal_heading_rect(
-			0, s->get_v_offset() - v_offset,
-			w, View::SignalHeight);
-
+		const int y = s->get_v_offset() - v_offset;
 		const bool highlight = !dragging && s->pt_in_label_rect(
-			signal_heading_rect, _mouse_point);
-		s->paint_label(painter, signal_heading_rect, highlight);
+			y, 0, w, _mouse_point);
+		s->paint_label(painter, y, w, highlight);
 	}
 
 	painter.end();
@@ -200,7 +194,7 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 	update();
 }
 
-void Header::leaveEvent(QEvent *event)
+void Header::leaveEvent(QEvent*)
 {
 	_mouse_point = QPoint(-1, -1);
 	update();
@@ -224,14 +218,16 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 
 void Header::on_action_set_name_triggered()
 {
+	bool ok = false;
+
 	shared_ptr<view::Signal> context_signal = _context_signal;
 	if (!context_signal)
 		return;
 
 	const QString new_label = QInputDialog::getText(this, tr("Set Name"),
-		tr("Name"), QLineEdit::Normal, context_signal->get_name());
+		tr("Name"), QLineEdit::Normal, context_signal->get_name(), &ok);
 
-	if (!new_label.isEmpty())
+	if (ok)
 		context_signal->set_name(new_label);
 }