X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fviews%2Ftabular_decoder%2Fview.cpp;h=0aca4790e8ecc6d984df00129811a1a82fae7077;hb=HEAD;hp=91bcaea197bee2a0645d9f314fb77c2f5053df21;hpb=20c99cfc69d3c7430817abd9a1f810698deb4a18;p=pulseview.git

diff --git a/pv/views/tabular_decoder/view.cpp b/pv/views/tabular_decoder/view.cpp
index 91bcaea1..c1d74290 100644
--- a/pv/views/tabular_decoder/view.cpp
+++ b/pv/views/tabular_decoder/view.cpp
@@ -202,7 +202,11 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 	save_action_->setText(tr("&Save..."));
 	save_action_->setIcon(QIcon::fromTheme("document-save-as",
 		QIcon(":/icons/document-save-as.png")));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	save_action_->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_S));
+#else
 	save_action_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S));
+#endif
 	connect(save_action_, SIGNAL(triggered(bool)),
 		this, SLOT(on_actionSave_triggered()));
 
@@ -470,6 +474,9 @@ void View::on_selected_decoder_changed(int index)
 	}
 
 	update_data();
+
+	// Force repaint, otherwise the new selection isn't shown for some reason
+	table_view_->viewport()->update();
 }
 
 void View::on_hide_hidden_changed(bool checked)
@@ -532,7 +539,8 @@ void View::on_signal_color_changed(const QColor &color)
 {
 	(void)color;
 
-	table_view_->update();
+	// Force immediate repaint, otherwise it's updated after the header popup is closed
+	table_view_->viewport()->update();
 }
 
 void View::on_new_annotations()
@@ -658,7 +666,6 @@ void View::on_metadata_object_changed(MetadataObject* obj,
 	// Check if we need to update the model's data range. We only work on the
 	// end sample value because the start sample value is updated first and
 	// we don't want to update the model twice
-
 	if ((view_mode_selector_->currentIndex() == ViewModeVisible) &&
 		(obj->type() == MetadataObjMainViewRange) &&
 		(value_type == MetadataValueEndSample)) {