changeset 780b0ee30d26 in /home/hg/repos/gajim

branches: 
details:http://hg.gajim.org/gajim?cmd=changeset;node=780b0ee30d26
description: don't use smooth scrolling when chnging fond or resizing chr 
window. Fixes #7268

diffstat:

 src/chat_control.py |  17 +++++++++++------
 1 файлов изменено, 11 вставок(+), 6 удалений(-)

различия (39 строк):

diff -r 9d90a9ab0419 -r 780b0ee30d26 src/chat_control.py
--- a/src/chat_control.py       Fri Aug 23 12:23:10 2013 +0400
+++ b/src/chat_control.py       Fri Aug 23 18:46:35 2013 +0400
@@ -1277,14 +1277,20 @@
         # used to stay at the end of the textview when we shrink conversation
         # textview.
         if self.was_at_the_end:
-            self.conv_textview.bring_scroll_to_end(-18, use_smooth=False)
-        self.was_at_the_end = (adjustment.upper - adjustment.value - 
adjustment.page_size) < 18
+            if self.conv_textview.at_the_end():
+                # we are at the end
+                self.conv_textview.bring_scroll_to_end(-18)
+            else:
+                self.conv_textview.bring_scroll_to_end(-18, use_smooth=False)
+        self.was_at_the_end = (adjustment.upper - adjustment.value - \
+            adjustment.page_size) < 18
 
     def on_conversation_vadjustment_value_changed(self, adjustment):
         # stop automatic scroll when we manually scroll
         if not self.conv_textview.auto_scrolling:
             self.conv_textview.stop_scrolling()
-        self.was_at_the_end = (adjustment.upper - adjustment.value - 
adjustment.page_size) < 18
+        self.was_at_the_end = (adjustment.upper - adjustment.value - \
+            adjustment.page_size) < 18
         if self.resource:
             jid = self.contact.get_full_jid()
         else:
@@ -1328,9 +1334,8 @@
             if room_jid in gajim.interface.minimized_controls[self.account]:
                 groupchat_control = \
                         
gajim.interface.minimized_controls[self.account][room_jid]
-            contact = \
-                    
gajim.contacts.get_contact_with_highest_priority(self.account, \
-                    room_jid)
+            contact = gajim.contacts.get_contact_with_highest_priority(
+                self.account, room_jid)
             if contact:
                 gajim.interface.roster.draw_contact(room_jid, self.account)
             if groupchat_control:
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to