From f1b6acfa48fceba7b89d0cc67b59e8c14ec7c806 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 17 Dec 2010 12:09:56 +0100
Subject: [PATCH] don't scroll in groupchat when window doesn't have focus.
Fixes #6100
---
src/conversation_textview.py | 8 +++++---
src/groupchat_control.py | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index 5a0ea06fb4..7302114d29 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -522,7 +522,7 @@ class ConversationTextview(gobject.GObject):
del self.xep0184_marks[id_]
del self.xep0184_shown[id_]
- def show_focus_out_line(self):
+ def show_focus_out_line(self, scroll=True):
if not self.allow_focus_out_line:
# if room did not receive focus-in from the last time we added
# --- line then do not readd
@@ -581,8 +581,10 @@ class ConversationTextview(gobject.GObject):
buffer_.end_user_action()
- # scroll to the end (via idle in case the scrollbar has appeared)
- gobject.idle_add(self.scroll_to_end)
+ if scroll:
+ # scroll to the end (via idle in case the scrollbar has
+ # appeared)
+ gobject.idle_add(self.scroll_to_end)
def show_xep0184_warning_tooltip(self):
pointer = self.tv.get_pointer()
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 8e62808848..ae9f369e33 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -1041,7 +1041,8 @@ class GroupchatControl(ChatControlBase):
# we have full focus (we are reading it!)
return
- self.conv_textview.show_focus_out_line()
+ at_the_end = self.conv_textview.at_the_end()
+ self.conv_textview.show_focus_out_line(scroll=at_the_end)
def needs_visual_notification(self, text):
"""
--
GitLab