From e31371fdf5c1d8886bd7682b5fb4fc5d94a68970 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Tue, 1 Oct 2019 22:38:21 +0200
Subject: [PATCH] Fixes #1344 Copying user id adds "ID: "

---
 src/widgets/dialogs/UserInfoPopup.cpp | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index 685b4e053..86f414e28 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -28,17 +28,23 @@
 
 namespace chatterino {
 namespace {
-    void addCopyableLabel(LayoutCreator<QHBoxLayout> box, Label **assign)
+    Label *addCopyableLabel(LayoutCreator<QHBoxLayout> box)
     {
-        auto label = box.emplace<Label>().assign(assign);
+        auto label = box.emplace<Label>();
         auto button = box.emplace<Button>();
         button->setPixmap(getResources().buttons.copyDark);
         button->setScaleIndependantSize(18, 18);
         button->setDim(Button::Dim::Lots);
-        QObject::connect(button.getElement(), &Button::leftClicked,
-                         [label = label.getElement()] {
-                             qApp->clipboard()->setText(label->getText());
-                         });
+        QObject::connect(
+            button.getElement(), &Button::leftClicked,
+            [label = label.getElement()] {
+                auto copyText = label->property("copy-text").toString();
+
+                qApp->clipboard()->setText(copyText.isEmpty() ? label->getText()
+                                                              : copyText);
+            });
+
+        return label.getElement();
     };
 }  // namespace
 
@@ -77,10 +83,10 @@ UserInfoPopup::UserInfoPopup()
                 auto box = vbox.emplace<QHBoxLayout>()
                                .withoutMargin()
                                .withoutSpacing();
-                addCopyableLabel(box, &this->ui_.nameLabel);
+                this->ui_.nameLabel = addCopyableLabel(box);
                 this->ui_.nameLabel->setFontStyle(FontStyle::UiMediumBold);
                 box->addStretch(1);
-                addCopyableLabel(box, &this->ui_.userIDLabel);
+                this->ui_.userIDLabel = addCopyableLabel(box);
                 auto palette = QPalette();
                 palette.setColor(QPalette::WindowText, QColor("#aaa"));
                 this->ui_.userIDLabel->setPalette(palette);
@@ -369,6 +375,7 @@ void UserInfoPopup::setData(const QString &name, const ChannelPtr &channel)
     this->channel_ = channel;
 
     this->ui_.nameLabel->setText(name);
+    this->ui_.nameLabel->setProperty("copy-text", name);
 
     this->updateUserData();
 
@@ -384,7 +391,8 @@ void UserInfoPopup::updateUserData()
 
         this->userId_ = id;
 
-        this->ui_.userIDLabel->setText(TEXT_USER_ID + this->userId_);
+        this->ui_.userIDLabel->setText(TEXT_USER_ID + id);
+        this->ui_.userIDLabel->setProperty("copy-text", id);
         // don't wait for the request to complete, just put the user id in the card
         // right away