From 6f98ca4cc1b777e35194fc6f6b38704e696d0937 Mon Sep 17 00:00:00 2001 From: Jens Steinhauser Date: Thu, 22 May 2014 22:03:28 +0200 Subject: [PATCH] Header: Invisible traces shouldn't influence the width. --- pv/view/header.cpp | 11 +++++++---- pv/view/header.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pv/view/header.cpp b/pv/view/header.cpp index a7902521..e7bfcbf0 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -72,7 +72,10 @@ QSize Header::sizeHint() const const vector< shared_ptr > traces(_view.get_traces()); BOOST_FOREACH(shared_ptr t, traces) { assert(t); - max_width = max(max_width, (int)t->get_label_rect(0).width()); + + if (t->enabled()) { + max_width = max(max_width, (int)t->get_label_rect(0).width()); + } } return QSize(max_width + Padding, 0); @@ -281,9 +284,9 @@ void Header::on_signals_changed() BOOST_FOREACH(shared_ptr t, traces) { assert(t); connect(t.get(), SIGNAL(visibility_changed()), - this, SLOT(update())); + this, SLOT(on_trace_changed())); connect(t.get(), SIGNAL(text_changed()), - this, SLOT(on_trace_text_changed())); + this, SLOT(on_trace_changed())); connect(t.get(), SIGNAL(colour_changed()), this, SLOT(update())); } @@ -294,7 +297,7 @@ void Header::on_signals_moved() update(); } -void Header::on_trace_text_changed() +void Header::on_trace_changed() { update(); geometry_updated(); diff --git a/pv/view/header.h b/pv/view/header.h index 5474f10e..489a5caa 100644 --- a/pv/view/header.h +++ b/pv/view/header.h @@ -74,7 +74,7 @@ private slots: void on_signals_moved(); - void on_trace_text_changed(); + void on_trace_changed(); signals: void signals_moved(); -- 2.30.2