X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=f1486ad9c4cf733dfa8b170c6b1827edcf609621;hp=17b9c1532cdea80da45e8fbce0e13ff7783a2a3d;hb=4cc2e925cf5056bc11514cc44da820eada72ce56;hpb=e0be5f218757a03a2132c50417190b82de1a6bd5

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 17b9c153..f1486ad9 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -129,6 +129,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 	scale_(1e-3),
 	offset_(0),
 	updating_scroll_(false),
+	settings_restored_(false),
 	sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui()
 	always_zoom_to_fit_(false),
 	tick_period_(0),
@@ -351,6 +352,8 @@ void View::restore_settings(QSettings &settings)
 		scroll_needs_defaults_ = false;
 		// Note: see eventFilter() for additional information
 	}
+
+	settings_restored_ = true;
 }
 
 vector< shared_ptr<TimeItem> > View::time_items() const
@@ -376,7 +379,7 @@ void View::set_scale(double scale)
 {
 	if (scale_ != scale) {
 		scale_ = scale;
-		Q_EMIT scale_changed();
+		scale_changed();
 	}
 }
 
@@ -389,7 +392,7 @@ void View::set_offset(const pv::util::Timestamp& offset)
 {
 	if (offset_ != offset) {
 		offset_ = offset;
-		Q_EMIT offset_changed();
+		offset_changed();
 	}
 }
 
@@ -419,7 +422,7 @@ void View::set_tick_prefix(pv::util::SIPrefix tick_prefix)
 {
 	if (tick_prefix_ != tick_prefix) {
 		tick_prefix_ = tick_prefix;
-		Q_EMIT tick_prefix_changed();
+		tick_prefix_changed();
 	}
 }
 
@@ -432,7 +435,7 @@ void View::set_tick_precision(unsigned tick_precision)
 {
 	if (tick_precision_ != tick_precision) {
 		tick_precision_ = tick_precision;
-		Q_EMIT tick_precision_changed();
+		tick_precision_changed();
 	}
 }
 
@@ -445,7 +448,7 @@ void View::set_tick_period(const pv::util::Timestamp& tick_period)
 {
 	if (tick_period_ != tick_period) {
 		tick_period_ = tick_period;
-		Q_EMIT tick_period_changed();
+		tick_period_changed();
 	}
 }
 
@@ -458,7 +461,7 @@ void View::set_time_unit(pv::util::TimeUnit time_unit)
 {
 	if (time_unit_ != time_unit) {
 		time_unit_ = time_unit;
-		Q_EMIT time_unit_changed();
+		time_unit_changed();
 	}
 }
 
@@ -872,7 +875,7 @@ void View::set_scroll_default()
 		set_v_offset(extents.first);
 }
 
-bool View::header_fully_visible() const
+bool View::header_was_shrunk() const
 {
 	const int header_pane_width = splitter_->sizes().front();
 	const int header_width = header_->extended_size_hint().width();
@@ -880,24 +883,31 @@ bool View::header_fully_visible() const
 	// Allow for a slight margin of error so that we also accept
 	// slight differences when e.g. a label name change increased
 	// the overall width
-	return (header_pane_width >= (header_width - 10));
+	return (header_pane_width < (header_width - 10));
 }
 
-void View::update_layout()
+void View::expand_header_to_fit()
 {
-	// Only adjust pane sizes if the header hasn't been partially hidden by the user
-	if (header_fully_visible()) {
-		int splitter_area_width = 0;
-		for (int w : splitter_->sizes())
-			splitter_area_width += w;
-
-		// Make sure the header has enough horizontal space to show all labels fully
-		QList<int> pane_sizes;
-		pane_sizes.push_back(header_->extended_size_hint().width());
-		pane_sizes.push_back(splitter_area_width - header_->extended_size_hint().width());
-		splitter_->setSizes(pane_sizes);
+	int splitter_area_width = 0;
+	for (int w : splitter_->sizes())
+		splitter_area_width += w;
+
+	// Workaround for when the header needs resizing but the view
+	// isn't visible yet and thus splitter_->sizes() returns (0, 0)
+	if (splitter_area_width == 0) {
+		QTimer::singleShot(50, this, SLOT(on_repeat_splitter_expansion()));
+		return;
 	}
 
+	// Make sure the header has enough horizontal space to show all labels fully
+	QList<int> pane_sizes;
+	pane_sizes.push_back(header_->extended_size_hint().width());
+	pane_sizes.push_back(splitter_area_width - header_->extended_size_hint().width());
+	splitter_->setSizes(pane_sizes);
+}
+
+void View::update_layout()
+{
 	update_scroll();
 }
 
@@ -1071,8 +1081,19 @@ void View::on_splitter_moved()
 	// Setting the maximum width of the header widget doesn't work as
 	// expected because the splitter would allow the user to make the
 	// pane wider than that, creating empty space as a result.
-	// To make this work, we stricly enforce the maximum width by calling
-	update_layout();
+	// To make this work, we stricly enforce the maximum width by
+	// expanding the header unless the user shrunk it on purpose.
+	// As we're then setting the width of the header pane, we set the
+	// splitter to the maximum allowed position.
+	if (!header_was_shrunk())
+		expand_header_to_fit();
+}
+
+void View::on_repeat_splitter_expansion()
+{
+	// Don't mess with the header if settings were restored in the meanwhile
+	if (!settings_restored_)
+		expand_header_to_fit();
 }
 
 void View::h_scroll_value_changed(int value)
@@ -1270,6 +1291,12 @@ void View::signals_changed()
 			offset += extents.second;
 	}
 
+
+	if (!new_top_level_items.empty())
+		// Expand the header pane because the header should become fully
+		// visible when new signals are added
+		expand_header_to_fit();
+
 	update_layout();
 
 	header_->update();