fix(widget): open a chat window instead of contacts list in multi-win…

…dow mode Closes #3212
qTox · Jun 3, 2016 · fdf0cbb · fdf0cbb
1 parent 431a10f
commit fdf0cbb
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
@@ -1188,8 +1188,28 @@ bool Widget::newFriendMessageAlert(int friendId, bool sound)
     }
     else
     {
-        currentWindow = window();
-        hasActive = f->getFriendWidget() == activeChatroomWidget;
+        if (Settings::getInstance().getSeparateWindow())
+        {
+            if (Settings::getInstance().getDontGroupWindows())
+            {
+                contentDialog = createContentDialog();
+            }
+            else
+            {
+                contentDialog = ContentDialog::current();
+                if (!contentDialog)
+                    contentDialog = createContentDialog();
+            }
+
+            addFriendDialog(f, contentDialog);
+            currentWindow = contentDialog->window();
+            hasActive = ContentDialog::isFriendWidgetActive(friendId);
+        }
+        else
+        {
+            currentWindow = window();
+            hasActive = f->getFriendWidget() == activeChatroomWidget;
+        }
     }
 
     if (newMessageAlert(currentWindow, hasActive, sound))
@@ -1390,7 +1410,6 @@ void Widget::updateScroll(GenericChatroomWidget *widget) {
 ContentDialog* Widget::createContentDialog() const
 {
     ContentDialog* contentDialog = new ContentDialog(settingsWidget);
-    contentDialog->show();
 #ifdef Q_OS_MAC
     connect(contentDialog, &ContentDialog::destroyed, &Nexus::getInstance(), &Nexus::updateWindowsClosed);
     connect(contentDialog, &ContentDialog::windowStateChanged, &Nexus::getInstance(), &Nexus::onWindowStateChanged);