- Improved code separation: everything specific to gnomeapplet is moved out of dockbar.py and into dockbar_factory. The dockbar class is also not acting differently depending on if it is runned in dockx, awn or gnome panel, instead it needs to be instructed by the calling class on how to act.

- The awn applet has been broken since size overflow management was introduced. It works again now (but it can't still manage size overflow).

Author: Matias Särs

AWN/DockBarX/DockBarX.py

@@ -57,11 +57,12 @@ def __on_idle(self):
         self.alignment = gtk.Alignment()
         self.add(self.alignment)
         self.alignment.show()
-        self.db = dockbarx.dockbar.DockBar(awn_applet=self)
+        self.db = dockbarx.dockbar.DockBar(self)
+        self.db.set_parent_window_reporting(True)
         self.db.load()
 
         # Inactive dockbarx's size overflow management
-        self.db.groups.max_size = 3000
+        self.db.set_max_size(3000)
 
         if self.get_pos_type() == gtk.POS_RIGHT:
             self.db.set_orient("right")
@@ -75,39 +76,41 @@ def __on_idle(self):
         else:
             self.db.set_orient("down")
             self.alignment.set(0, 1, 0, 0)
-        if self.db.orient in ("down", "up"):
-            self.db.container.set_size_request(-1, self.get_size() + \
+        container = self.db.get_container()
+        if self.db.get_orient() in ("down", "up"):
+            container.set_size_request(-1, self.get_size() + \
                                                self.icon.get_offset() + 5)
         else:
-            self.db.container.set_size_request(self.get_size() + \
+            container.set_size_request(self.get_size() + \
                                                self.icon.get_offset() + 5, -1)
-        self.alignment.add(self.db.container)
+        self.alignment.add(container)
         self.connect("size-changed", self.__on_size_changed)
         self.connect("offset-changed", self.__on_size_changed)
         self.connect("position-changed", self.__on_position_changed)
         self.globals.connect("awn-behavior-changed",
                              self.__on_behavior_changed)
-        self.db.container.show()
+        container.show_all()
         self.show()
         self.wnck_screen.connect("active-window-changed",
                                  self.__on_active_window_changed)
         gobject.timeout_add(200, self.__update_autohide)
-        for window in self.db.windows:
+        for window in self.db.get_windows():
             self.add_window(window)
         self.db_loaded = True
         self.__compute_should_autohide()
 
     def __on_size_changed(self, *args):
-        if self.db.orient in ("down", "up"):
-            self.db.container.set_size_request(-1, self.get_size() + \
+        container = self.db.get_container()
+        if self.db.get_orient() in ("down", "up"):
+            container.set_size_request(-1, self.get_size() + \
                                                self.icon.get_offset() + 5)
         else:
-            self.db.container.set_size_request(self.get_size() + \
+            container.set_size_request(self.get_size() + \
                                                self.icon.get_offset() + 5, -1)
         self.__compute_should_autohide()
 
     def __on_position_changed(self, applet, position):
-        self.alignment.remove(self.db.container)
+        self.alignment.remove(self.db.get_container())
         if self.get_pos_type() == gtk.POS_RIGHT:
             self.db.set_orient("right")
             self.alignment.set(1, 0, 0, 0)
@@ -120,14 +123,15 @@ def __on_position_changed(self, applet, position):
         else:
             self.db.set_orient("down")
             self.alignment.set(0, 1, 0, 0)
-        if self.db.orient in ("up", "down"):
-            self.db.container.set_size_request(-1, self.get_size() + \
+        container = self.db.get_container()
+        if self.db.get_orient() in ("up", "down"):
+            container.set_size_request(-1, self.get_size() + \
                                                self.icon.get_offset() + 5)
         else:
-            self.db.container.set_size_request(self.get_size() + \
+            container.set_size_request(self.get_size() + \
                                                self.icon.get_offset() + 5, -1)
-        self.alignment.add(self.db.container)
-        self.db.container.show()
+        self.alignment.add(container)
+        container.show_all()
         self.show()
         self.__compute_should_autohide()
 
@@ -216,7 +220,7 @@ def __compute_should_autohide(self):
             return True
         self.should_autohide = False
         active_workspace = self.wnck_screen.get_active_workspace()
-        for window in self.db.windows:
+        for window in self.db.get_windows():
             if window.is_minimized():
                 continue
             if self.behavior == "dodge active window" and \

dockbarx/cairowidgets.py

@@ -35,15 +35,15 @@
 class CairoAppButton(gtk.EventBox):
     __gsignals__ = {"expose-event" : "override",
                     "size_allocate": "override"}
-    def __init__(self, surface=None, in_dock=False):
+    def __init__(self, surface=None, expose_on_clear=False):
         gtk.EventBox.__init__(self)
         self.set_visible_window(False)
         self.area = gtk.Alignment(0, 0, 1, 1)
         self.add(self.area)
         self.area.show()
         self.globals = Globals()
         self.surface = surface
-        self.in_dock = in_dock
+        self.expose_on_clear = expose_on_clear
         self.badge = None
         self.badge_text = None
         self.progress_bar = None
@@ -59,7 +59,7 @@ def update(self, surface=None):
             self.surface = surface
         if self.window is None:
             return
-        if self.in_dock:
+        if self.expose_on_clear:
             self.area.window.clear_area_e(a.x, a.y, a.width, a.height)
         else:
             self.area.window.clear_area(a.x, a.y, a.width, a.height)

dockbarx/dbx_dbus.py

@@ -40,7 +40,7 @@ def __init__(self, dockbar):
                          in_signature="", out_signature="",)
     def Reload(self):
         dockbar = self.dockbar_r()
-        if not dockbar.is_dock:
+        if not dockbar.no_dbus_reload:
             dockbar.reload()
 
     @dbus.service.method(dbus_interface=dbus.PROPERTIES_IFACE,