Changeset 6732e9214dde078a37f726e24faf0d0f9a156c03 for sx-background

Timestamp:

06/13/2009 03:07:36 PM (15 months ago)

Author:

dunk <dunk@…>

Children:

e16d70dd7f47993875d85b75b8b673c1daa85bc6

Parents:

8d7d83a65de65a32682494df1473805ebb90e4c3

git-committer:

dunk <dunk@inspo.(none)> / 2009-06-13T15:07:36Z+0100

Message:

just depend on yahiko for drawing with sx-background. add (broken) svg support to yahiko styles

Files:

• sx-background/sxbackground.py (modified) (2 diffs)

sx-background/sxbackground.py

@@ -7 +7 @@
 import ooxcb
 
+from yahiko.ui import Window
 
-# ripped from yahiko
-def default_func(cr, style, width, height):
-    x = 0
-    y = 0
-    if 'background.style' in style: 
-        cairo.cairo_rectangle(cr, x, y, width, height)
 
-        bstyle = style.get('background.style')
-        assert bstyle in ('fill', 'gradient', 'image')
-        if bstyle == 'fill' and 'background.color' in style:
-            cairo.cairo_set_source_rgb(cr, *style['background.color'])
-            cairo.cairo_fill(cr)
-        elif bstyle == 'gradient' and 'background.fill-line' in style and 'background.fill-stops' in style:
-            pat = cairo.cairo_pattern_create_linear(*style['background.fill-line'])
-            for stop in style['background.fill-stops']:
-                cairo.cairo_pattern_add_color_stop_rgb(pat, *stop)
-            cairo.cairo_set_source(cr, pat)
-            cairo.cairo_fill(cr)
-        elif bstyle == 'image' and 'background.image' in style and style['background.image']:
-            image = cairo.cairo_image_surface_create_from_png(style.get('background.image'))
-            w = float(cairo.cairo_image_surface_get_width(image))
-            h = float(cairo.cairo_image_surface_get_height(image))
-
-            cairo.cairo_scale(cr, width/w, height/h)
-
-            cairo.cairo_set_source_surface(cr, image, x, y)
-            cairo.cairo_paint(cr)
-
-    if 'border.color' in style:
-        bstyle = style.get('style', 'fill')
-        assert bstyle in ('fill', 'gradient')
-        if bstyle == 'fill' and 'border.color' in style:
-            cairo.cairo_set_source_rgb(cr, *style['border.color'])
-        elif bstyle == 'gradient' and 'border.fill-line' in style and 'border.fill-stops' in style:
-            pat = cairo.cairo_pattern_create_linear(*style['border.fill-line'])
-            for stop in style['border.fill-stops']:
-                cairo.cairo_pattern_add_color_stop_rgb(pat, *stop)
-            cairo.cairo_set_source(cr, pat)
-        cairo.cairo_set_line_width(cr, style.get('width', 1.0))
-        cairo.cairo_rectangle(cr, x, y, width, height)
-        cairo.cairo_stroke(cr)
+def yahiko_render(cr, style, width, height):
+    win = Window(style=style)
+    win.set_render_coords(0, 0, width, height)
+    win.render(cr)
 
 
@@ -70 +35 @@
     cr = cairo.cairo_create(surface)
     if func is None:
-        func = default_func
+        func = yahiko_render
     func(cr, style, geom.width, geom.height)