commit e8323b63aa6b96ed171b64a6ec87fb79603043d2
author Yingdi Yu <yuyingdi@gmail.com> Tue Sep 02 17:24:15 2014 -0700
committer Yingdi Yu <yuyingdi@gmail.com> Tue Sep 23 10:59:44 2014 -0700
tree 4e3c87d11cd8b716595696f83830811b06a83a15
parent d85e29feb357211a48cf5eb2adaf39a82be1fcc5

bug: Fix re-show chatdialog

Change-Id: Ia11aabc1c22ed3f92fc24be2fcd8a60e49044aad

src/chat-dialog.cpp

diff --git a/src/chat-dialog.cpp b/src/chat-dialog.cpp
index f2bdf86..0079f4f 100644
--- a/src/chat-dialog.cpp
+++ b/src/chat-dialog.cpp
@@ -240,7 +240,7 @@
                               "system tray. To close the chatroom, "
                               "choose <b>Close chatroom</b> in the "
                               "context memu of the system tray entry."));
-  hide();//ymj
+  hide();
   e->ignore();
 }
 
@@ -1018,6 +1018,14 @@
 }
 
 void
+ChatDialog::onShow()
+{
+  this->show();
+  this->raise();
+  this->activateWindow();
+}
+
+void
 ChatDialog::onClose()
 {
   hide();

src/chat-dialog.hpp

diff --git a/src/chat-dialog.hpp b/src/chat-dialog.hpp
index 9c4008e..7c63b30 100644
--- a/src/chat-dialog.hpp
+++ b/src/chat-dialog.hpp
@@ -249,6 +249,9 @@
 
 public slots:
   void
+  onShow();
+
+  void
   onLocalPrefixUpdated(const QString& localPrefix);
 
   void

src/controller.cpp

diff --git a/src/controller.cpp b/src/controller.cpp
index 313c673..fc4037b 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -547,7 +547,7 @@
   QAction* chatAction = new QAction(chatroomName, this);
   m_chatActionList[chatroomName.toStdString()] = chatAction;
   connect(chatAction, SIGNAL(triggered()),
-          chatDialog, SLOT(raise()));//ymj
+          chatDialog, SLOT(onShow()));
 
   QAction* closeAction = new QAction(chatroomName, this);
   m_closeActionList[chatroomName.toStdString()] = closeAction;