Changeset 8596 for branches/gajim_0.11.1/src/chat_control.py

Timestamp:

08/29/07 22:44:31 (15 months ago)

Author:

roidelapluie

Message:

Scroll to the end when we shrink conversation window. Fix #3078.

Files:

• branches/gajim_0.11.1/src/chat_control.py (modified) (8 diffs)

branches/gajim_0.11.1/src/chat_control.py

@@ -145 +145 @@
                         self.on_conversation_vadjustment_value_changed)
                 self.handlers[id] = widget
+                id = widget.connect('changed',
+                        self.on_conversation_vadjustment_changed)
+                self.handlers[id] = widget
+                self.scroll_to_end_id = None
+                self.was_at_the_end = True
                 # add MessageTextView to UI and connect signals
                 self.msg_scrolledwindow = self.xml.get_widget('message_scrolledwindow')
@@ -552 +557 @@
                 textview = self.conv_textview
                 end = False
-                if textview.at_the_end() or kind == 'outgoing':
+                if self.was_at_the_end or kind == 'outgoing':
                         end = True
                 textview.print_conversation_line(text, jid, kind, name, tim,
@@ -658 +663 @@
                 if state:
                         jid = self.contact.jid
-                        if self.conv_textview.at_the_end():
+                        if self.was_at_the_end:
                                 # we are at the end
                                 type_ = 'printed_' + self.type_id
@@ -673 +678 @@
         def bring_scroll_to_end(self, textview, diff_y = 0):
                 ''' scrolls to the end of textview if end is not visible '''
+                if self.scroll_to_end_id:
+                        # a scroll is already planned
+                        return
                 buffer = textview.get_buffer()
                 end_iter = buffer.get_end_iter()
@@ -679 +687 @@
                 # scroll only if expected end is not visible
                 if end_rect.y >= (visible_rect.y + visible_rect.height + diff_y):
-                        gobject.idle_add(self.scroll_to_end_iter, textview)
+                        self.scroll_to_end_id = gobject.idle_add(self.scroll_to_end_iter,
+                                textview)
 
         def scroll_to_end_iter(self, textview):
@@ -685 +694 @@
                 end_iter = buffer.get_end_iter()
                 textview.scroll_to_iter(end_iter, 0, False, 1, 1)
+                self.scroll_to_end_id = None
                 return False
 
@@ -742 +752 @@
                 return True
 
-        def on_conversation_vadjustment_value_changed(self, widget):
+        def on_conversation_vadjustment_changed(self, adjustment):
+                # 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)
+                self.was_at_the_end = (adjustment.upper - adjustment.value - adjustment.page_size) < 18
+
+        def on_conversation_vadjustment_value_changed(self, adjustment):
+                self.was_at_the_end = (adjustment.upper - adjustment.value - adjustment.page_size) < 18
                 if self.resource:
                         jid = self.contact.get_full_jid()
@@ -754 +772 @@
                         return
                 if self.conv_textview.at_the_end() and \
-                                self.parent_win.get_active_control() == self and \
-                                self.parent_win.window.is_active():
+                self.parent_win.get_active_control() == self and \
+                self.parent_win.window.is_active():
                         # we are at the end
-                        type_ = self.type_id
-                        if type_ == message_control.TYPE_GC:
-                                type_ = 'gc_msg'
                         if not gajim.events.remove_events(self.account, self.get_full_jid(),
                         types = ['printed_' + type_, type_]):