From 16b2b2458cbfbdd6a6ac2bb902795a45dd674057 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Sat, 5 Oct 2019 18:16:37 +0200
Subject: [PATCH] Fixes #1331 emote picker out of bounds

---
 lib/appbase/widgets/BaseWindow.cpp    | 4 +---
 src/widgets/dialogs/UserInfoPopup.cpp | 2 --
 src/widgets/splits/SplitInput.cpp     | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/appbase/widgets/BaseWindow.cpp b/lib/appbase/widgets/BaseWindow.cpp
index b18a932b..2e879393 100644
--- a/lib/appbase/widgets/BaseWindow.cpp
+++ b/lib/appbase/widgets/BaseWindow.cpp
@@ -538,11 +538,9 @@ void BaseWindow::closeEvent(QCloseEvent *)
 
 void BaseWindow::showEvent(QShowEvent *)
 {
+    this->moveIntoDesktopRect(this);
     if (this->frameless_)
     {
-        this->moveIntoDesktopRect(this);
-        qDebug() << "show";
-
         QTimer::singleShot(30, this,
                            [this] { this->moveIntoDesktopRect(this); });
     }
diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index 86f414e2..77e0c347 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -58,8 +58,6 @@ UserInfoPopup::UserInfoPopup()
     this->setWindowFlag(Qt::Popup);
 #endif
 
-    auto app = getApp();
-
     auto layout = LayoutCreator<QWidget>(this->getLayoutContainer())
                       .setLayoutType<QVBoxLayout>();
 
diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp
index 2d5dc5dd..e02a2e69 100644
--- a/src/widgets/splits/SplitInput.cpp
+++ b/src/widgets/splits/SplitInput.cpp
@@ -154,6 +154,7 @@ void SplitInput::openEmotePopup()
     if (!this->emotePopup_)
     {
         this->emotePopup_ = new EmotePopup(this);
+        this->emotePopup_->setStayInScreenRect(true);
         this->emotePopup_->setAttribute(Qt::WA_DeleteOnClose);
 
         this->emotePopup_->linkClicked.connect([this](const Link &link) {