X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=c7796efcf8618784fd463d9d5840b265ee77fe78;hb=476ca5f48e8a528d529f36b8b0c8471c655415ad;hp=f7f60a28b49d9586c539bf4c4c8875fe7a9a46db;hpb=ab185f78707eb2800c8b9ea577412ea5f6319f22;p=pulseview.git

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index f7f60a28..c7796efc 100644
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -288,6 +288,8 @@ void DecodeTrace::update_stack_button()
 			connect(decoder_menu, SIGNAL(decoder_selected(srd_decoder*)),
 				this, SLOT(on_stack_decoder(srd_decoder*)));
 
+			decoder_menu->setStyleSheet("QMenu { menu-scrollable: 1; }");
+
 			stack_button_->setMenu(decoder_menu);
 			stack_button_->show();
 			return;
@@ -408,7 +410,7 @@ QMenu* DecodeTrace::create_view_context_menu(QWidget *parent, QPoint &click_pos)
 	QAction *const copy_annotation_to_clipboard =
 		new QAction(tr("Copy annotation text to clipboard"), this);
 	copy_annotation_to_clipboard->setIcon(QIcon::fromTheme("edit-paste",
-		QIcon(":/icons/edit-paste.png")));
+		QIcon(":/icons/edit-paste.svg")));
 	connect(copy_annotation_to_clipboard, SIGNAL(triggered()), this, SLOT(on_copy_annotation_to_clipboard()));
 	menu->addAction(copy_annotation_to_clipboard);
 
@@ -1216,7 +1218,10 @@ void DecodeTrace::on_copy_annotation_to_clipboard()
 		return;
 
 	QClipboard *clipboard = QGuiApplication::clipboard();
-	clipboard->setText(annotations->front().annotations().front());
+	clipboard->setText(annotations->front().annotations().front(), QClipboard::Clipboard);
+
+	if (clipboard->supportsSelection())
+		clipboard->setText(annotations->front().annotations().front(), QClipboard::Selection);
 
 	delete annotations;
 }