X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftrace.cpp;h=bbd0115fb65af00512508c7129d3e6399b12a3a2;hp=8c450a088604e543a2b1f41e421011e0e3d719db;hb=39dce56b0e0b4daba503663e44ee6c86a754ddc2;hpb=9e773fecf2d4ab8f2fc6e1cc880b9102c22ec228

diff --git a/pv/views/trace/trace.cpp b/pv/views/trace/trace.cpp
index 8c450a0..bbd0115 100644
--- a/pv/views/trace/trace.cpp
+++ b/pv/views/trace/trace.cpp
@@ -78,6 +78,26 @@ shared_ptr<data::SignalBase> Trace::base() const
 	return base_;
 }
 
+bool Trace::is_selectable(QPoint pos) const
+{
+	// True if the header was clicked, false if the trace area was clicked
+	const View *view = owner_->view();
+	assert(view);
+
+	return (pos.x() <= view->header_width());
+}
+
+bool Trace::is_draggable(QPoint pos) const
+{
+	// While the header label that belongs to this trace is draggable,
+	// the trace itself shall not be. Hence we return true if the header
+	// was clicked and false if the trace area was clicked
+	const View *view = owner_->view();
+	assert(view);
+
+	return (pos.x() <= view->header_width());
+}
+
 void Trace::set_segment_display_mode(SegmentDisplayMode mode)
 {
 	segment_display_mode_ = mode;
@@ -90,6 +110,10 @@ void Trace::on_setting_changed(const QString &key, const QVariant &value)
 {
 	if (key == GlobalSettings::Key_View_ShowHoverMarker)
 		show_hover_marker_ = value.toBool();
+
+	// Force a repaint since many options alter the way traces look
+	if (owner_)
+		owner_->row_item_appearance_changed(false, true);
 }
 
 void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
@@ -189,10 +213,16 @@ QRectF Trace::label_rect(const QRectF &rect) const
 
 QRectF Trace::hit_box_rect(const ViewItemPaintParams &pp) const
 {
+	// This one is only for the trace itself, excluding the header area
+	const View *view = owner_->view();
+	assert(view);
+
 	pair<int, int> extents = v_extents();
 	const int top = pp.top() + get_visual_y() + extents.first;
 	const int height = extents.second - extents.first;
-	return QRectF(pp.left(), top, pp.width(), height);
+
+	return QRectF(pp.left() + view->header_width(), top,
+		pp.width() - view->header_width(), height);
 }
 
 void Trace::set_current_segment(const int segment)