X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsignal.cpp;h=7d3dd66362f4c5ab182b4503ab2e0294d5f93066;hp=282d272bf7df3395287fd6e5e5b127b022cfdca1;hb=a29bb7fb6aa3665c21da1e06a3d3c4ca80f4437f;hpb=cef18fc6160f8f5055f2617fbe06eb082c2a7bd5

diff --git a/pv/signal.cpp b/pv/signal.cpp
index 282d272b..7d3dd663 100644
--- a/pv/signal.cpp
+++ b/pv/signal.cpp
@@ -25,6 +25,7 @@
 namespace pv {
 
 const QSizeF Signal::LabelPadding(4, 0);
+const int Signal::LabelHitPadding = 2;
 
 Signal::Signal(QString name) :
 	_name(name)
@@ -36,25 +37,13 @@ QString Signal::get_name() const
 	return _name;
 }
 
-void Signal::paint_label(QPainter &p, const QRect &rect)
+void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	p.setBrush(get_colour());
 
-	const QString text(_name);
 	const QColor colour = get_colour();
-
-	const QSizeF text_size = p.boundingRect(
-		QRectF(0, 0, rect.width(), 0), 0, text).size();
-
 	const float nominal_offset = get_nominal_offset(rect);
-	const QSizeF label_size(
-		text_size.width() + LabelPadding.width() * 2,
-		text_size.height() + LabelPadding.height() * 2);
-	const float label_arrow_length = label_size.height() / 2;
-	const QRectF label_rect(
-		rect.right() - label_arrow_length - label_size.width(),
-		nominal_offset - label_size.height() / 2,
-		label_size.width(), label_size.height());
+	const QRectF label_rect = get_label_rect(p, rect);
 
 	// Paint the label
 	const QPointF points[] = {
@@ -74,7 +63,7 @@ void Signal::paint_label(QPainter &p, const QRect &rect)
 	};
 
 	p.setPen(Qt::transparent);
-	p.setBrush(colour);
+	p.setBrush(hover ? colour.lighter() : colour);
 	p.drawPolygon(points, countof(points));
 
 	p.setPen(colour.lighter());
@@ -87,7 +76,35 @@ void Signal::paint_label(QPainter &p, const QRect &rect)
 
 	// Paint the text
 	p.setPen((colour.lightness() > 64) ? Qt::black : Qt::white);
-	p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, text);
+	p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
+}
+
+bool Signal::pt_in_label_rect(QPainter &p,
+	const QRect &rect, const QPoint &point)
+{
+	const QRectF label = get_label_rect(p, rect);
+	return QRectF(
+		QPointF(label.left() - LabelHitPadding,
+			label.top() - LabelHitPadding),
+		QPointF(rect.right(),
+			label.bottom() + LabelHitPadding)
+		).contains(point);
+}
+
+QRectF Signal::get_label_rect(QPainter &p, const QRect &rect)
+{
+	const QSizeF text_size = p.boundingRect(
+		QRectF(0, 0, rect.width(), 0), 0, _name).size();
+
+	const float nominal_offset = get_nominal_offset(rect);
+	const QSizeF label_size(
+		text_size.width() + LabelPadding.width() * 2,
+		text_size.height() + LabelPadding.height() * 2);
+	const float label_arrow_length = label_size.height() / 2;
+	return QRectF(
+		rect.right() - label_arrow_length - label_size.width(),
+		nominal_offset - label_size.height() / 2,
+		label_size.width(), label_size.height());
 }
 
 } // namespace pv