Changeset 1824

Timestamp:

08/02/07 05:55:05 (1 year ago)

Author:

arj..@yirdis.nl

Message:

• Do bounding box updates in a separate idle method, no longer depends on expose() being called.
  

Files:

• gaphas/trunk/gaphas/canvas.py (modified) (1 diff)
• gaphas/trunk/gaphas/tests/test_view.py (modified) (1 diff)
• gaphas/trunk/gaphas/view.py (modified) (5 diffs)

gaphas/trunk/gaphas/canvas.py

@@ -77 +77 @@
-
-        self.request_update(item)
-
+#
-
-

gaphas/trunk/gaphas/tests/test_view.py

@@ -77 +77 @@
-            gtk.main_iteration()
-
-        assert not view._update_bounding_box
-        assert len(view._qtree._ids) == 1
-        assert not view._qtree._bucket.bounds == (0, 0, 0, 0), view._qtree._bucket.bounds

gaphas/trunk/gaphas/view.py

@@ -410 +410 @@
-        self.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse('#FFF'))
-
-        self._update_bounding_box = set()
-
-
-    def emit(self, *args, **kwargs):
@@ -508 +506 @@
-        
-
-    @async(single=False, priority=PRIORITY_HIGH_IDLE)
-    def _idle_queue_draw_item(self, *items):
-        self.queue_draw_item(*items)
-
-
-    def queue_draw_item(self, *items):
-        """
@@ -551 +544 @@
-
-            for item in removed_items:
-
-
-
-
+
-                self.selected_items.discard(item)
-
@@ -605 +595 @@
-                self.queue_draw_item(i)
-
-
-
+
-        finally:
-            self._dirty_items.clear()
-            self._dirty_matrix_items.clear()
+
+
+    @async(single=False)
+    def update_bounding_box(self, items):
+        """
+        Update bounding box is not necessary
+        """
+        cr = self.window.cairo_create()
+
+        cr.save()
+        cr.rectangle(0, 0, 0, 0)
+        cr.clip()
+        try:
+            super(GtkView, self).update_bounding_box(cr, items)
+        finally:
+            cr.restore()
+        self.queue_draw_item(*items)
+        self.update_adjustments()
-
-
@@ -643 +650 @@
-        cr.rectangle(x, y, w, h)
-        cr.clip()
-
-        update_bounding_box = self._update_bounding_box
-        if update_bounding_box:
-            try:
-                cr.save()
-                cr.rectangle(0, 0, 0, 0)
-                cr.clip()
-                try:
-                    self.update_bounding_box(cr, update_bounding_box)
-                finally:
-                    cr.restore()
-                self._idle_queue_draw_item(*update_bounding_box)
-                self.update_adjustments()
-            finally:
-                update_bounding_box.clear()
-
-        area = Rectangle(x, y, width=w, height=h)