Changeset 9157 for branches/one_window/src/message_window.py

Timestamp:

12/16/07 01:47:20 (11 months ago)

Author:

nicfit

Message:

Resizing fixes and make the roster window shrink when last tab is removed

Files:

• branches/one_window/src/message_window.py (modified) (5 diffs)

branches/one_window/src/message_window.py

@@ -428 +428 @@
                         # dnd clean up
                         self.notebook.drag_dest_unset()
-                        self.window.destroy()
+                        if self.parent_paned:
+                                # Don't close parent window, just remove the child
+                                child = self.parent_paned.get_child2()
+                                self.parent_paned.remove(child)
+                                # FIXME: restore preferred roster size
+                        else:
+                                self.window.destroy()
                         return # don't show_title, we are dead
                 elif self.get_num_controls() == 1: # we are going from two tabs to one
@@ -694 +700 @@
 
 ################################################################################
-class MessageWindowMgr:
+class MessageWindowMgr(gobject.GObject):
         '''A manager and factory for MessageWindow objects'''
+        __gsignals__ = {
+                'window-delete': (gobject.SIGNAL_RUN_LAST, None, (object,)),
+        }
 
         # These constants map to common.config.opt_one_window_types indices
@@ -717 +726 @@
                 ONE_MSG_WINDOW_PERACCT: The key is the account name
                 ONE_MSG_WINDOW_PERTYPE: The key is a message type constant'''
+                gobject.GObject.__init__(self)
                 self._windows = {}
 
@@ -879 +889 @@
                 for k in self._windows.keys():
                         if self._windows[k].window == win:
+                                self.emit('window-delete', self._windows[k])
                                 del self._windows[k]
                                 return
@@ -945 +956 @@
                         size_height_key = type + '-msgwin-height'
                 elif self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
-                        width -= msg_win.parent_paned.get_position()
+                        # Ignore any hpaned width
+                        width = msg_win.notebook.allocation.width
 
                 if acct: