kozorizki/gaphas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove area from drawing context

Browse Source
This commit is contained in:
Arjan Molenaar 2020-05-22 22:46:38 +02:00
parent 916a11446e
commit 928e82397c
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gaphas/freehand.py
View File

@ -171,6 +171,5 @@ class FreeHandPainter:
subcontext = Context(
cairo=FreeHandCairoContext(context.cairo, self.sloppiness),
items=context.items,
area=context.area,
)
self.subpainter.paint(subcontext)

13
gaphas/painter.py
View File

@ -86,7 +86,7 @@ class DrawContext(Context):
class ItemPainter(Painter):
def draw_item(self, item, cairo, area=None):
def draw_item(self, item, cairo):
view = self.view
cairo.save()
try:
@ -97,7 +97,6 @@ class ItemPainter(Painter):
DrawContext(
painter=self,
cairo=cairo,
_area=area,
_item=item,
selected=(item in view.selected_items),
focused=(item is view.focused_item),
@ -109,12 +108,12 @@ class ItemPainter(Painter):
finally:
cairo.restore()
def draw_items(self, items, cairo, area=None):
def draw_items(self, items, cairo):
"""
Draw the items.
"""
for item in items:
self.draw_item(item, cairo, area=area)
self.draw_item(item, cairo)
if DEBUG_DRAW_BOUNDING_BOX:
self._draw_bounds(item, cairo)
@ -137,7 +136,7 @@ class ItemPainter(Painter):
cairo = context.cairo
cairo.set_tolerance(TOLERANCE)
cairo.set_line_join(LINE_JOIN_ROUND)
self.draw_items(context.items, cairo, context.area)
self.draw_items(context.items, cairo)
class CairoBoundingBoxContext:
@ -250,7 +249,7 @@ class BoundingBoxPainter(Painter):
super().set_view(view)
self.item_painter.set_view(view)
def draw_item(self, item, cairo, area=None):
def draw_item(self, item, cairo):
cairo = CairoBoundingBoxContext(cairo)
self.item_painter.draw_item(item, cairo)
bounds = cairo.get_bounds()
@ -265,7 +264,7 @@ class BoundingBoxPainter(Painter):
bounds.expand(1)
view.set_item_bounding_box(item, bounds)
def draw_items(self, items, cairo, area=None):
def draw_items(self, items, cairo):
"""
Draw the items.
"""

4
gaphas/view.py
View File

@ -387,7 +387,7 @@ class View:
items = self.canvas.get_all_items()
# The painter calls set_item_bounding_box() for each rendered item.
painter.paint(Context(cairo=cr, items=items, area=None))
painter.paint(Context(cairo=cr, items=items))
# Update the view's bounding box with the rest of the items
self._bounds = Rectangle(*self._qtree.soft_bounds)
@ -793,7 +793,7 @@ class GtkView(Gtk.DrawingArea, Gtk.Scrollable, View):
(0, 0, allocation.width, allocation.height)
)
self.painter.paint(Context(cairo=cr, items=items, area=None))
self.painter.paint(Context(cairo=cr, items=items))
if DEBUG_DRAW_BOUNDING_BOX:
cr.save()