mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-03-07 08:05:40 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-1784: Do not surpress ROAR popup when chat container is inactive/has no focus

Browse Source 
Prior to this change, popups where surpressed when the chat container was not explicitly closed.
This commit is contained in:
Guus der Kinderen
2020-08-04 22:21:53 +02:00
parent bb626ef34f
commit 72900a31de
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/roar/src/main/java/org/jivesoftware/spark/roar/RoarMessageListener.java
View File

@ -55,8 +55,10 @@ public class RoarMessageListener implements GlobalMessageListener {
int framestate = SparkManager.getChatManager().getChatContainer().getChatFrame().getState();
final boolean chatContainerHasFocus = SparkManager.getChatManager().getChatContainer().isFocusOwner();
// If the message is for a chat that's currently active and showing, do not popup.
if (framestate == JFrame.NORMAL && activeroom.equals(room) && room.isShowing()
if (!chatContainerHasFocus && framestate == JFrame.NORMAL && activeroom.equals(room) && room.isShowing()
&& (isOldGroupChat(room) || isMessageFromRoom(room, message))) {
Log.debug( "Surpressing popup: chat is currently active and showing.");
return;