mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-1291

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@12280 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Wolf Posdorfer
2011-04-26 14:24:53 +00:00
committed by wolf.posdorfer
parent cac1b0ef2a
commit fae878b7e5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/org/jivesoftware/spark/ui/ChatContainer.java
View File

@ -467,6 +467,10 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
setSelectedIndex(tabLocation);
groupChatMessageCheck(chatRoom, customMsg, customMsgText, customMsgTitle);
return;
}
if(chatFrame.isVisible() && chatFrame.getState()== Frame.NORMAL)
{
groupChatMessageCheck(chatRoom, customMsg, customMsgText, customMsgTitle);
}
if (!chatFrame.isVisible() && SparkManager.getMainWindow().isFocusOwner()) {
@ -1191,12 +1195,11 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
}
if (pref.getWindowTakesFocus() || SparkManager.getMainWindow().isActive()) {
if (SparkManager.getMainWindow().isActive() || pref.getWindowTakesFocus()) {
chatFrame.setState(Frame.NORMAL);
} else {
chatFrame.setState(Frame.ICONIFIED);
}