Increase the window size a bit

[wordgame] / demo-item.c

diff --git a/demo-item.c b/demo-item.c
index 99aaf4afa856a24213c2ea26841e323fe625d6e8..198857ed5206c50412abadbe4e585207c6a5fba9 100644 (file)
--- a/demo-item.c
+++ b/demo-item.c
@@ -18,43 +18,38 @@ G_DEFINE_TYPE (GooDemoItem, goo_demo_item, GOO_TYPE_CANVAS_ITEM_SIMPLE)
     static void
 goo_demo_item_init (GooDemoItem *demo_item)
 {
-    demo_item->size = 0.0;
-}
-
-void
-goo_demo_item_move_to (GooCanvasItem   *item,
-                      gdouble           x,
-                      gdouble           y)
-{
-    cairo_matrix_t matrix;
-
-    cairo_matrix_init_translate (&matrix, x, y);
-    goo_canvas_item_set_transform (item, &matrix);
+    demo_item->width = 0.0;
+    demo_item->height = 0.0;
 }
 
 /* The convenience function to create new items. This should start with a 
    parent argument and end with a variable list of object properties to fit
    in with the standard canvas items. */
 GooCanvasItem*
-goo_demo_item_new (GooCanvasItem      *parent,
-                  gdouble             x,
-                  gdouble             y,
-                  gdouble             size,
-                  char                letter,
+goo_demo_item_new (GooCanvasItem       *parent,
+                  gdouble               x,
+                  gdouble               y,
+                  gdouble               width,
+                  gdouble               height,
+                  GooDemoItemPaintFunc  paint,
+                  void                 *closure,
                   ...)
 {
     GooCanvasItem *item;
     GooDemoItem *demo_item;
     const char *first_property;
     va_list var_args;
+    cairo_matrix_t matrix;
 
     item = g_object_new (GOO_TYPE_DEMO_ITEM, NULL);
 
     demo_item = (GooDemoItem*) item;
-    demo_item->size = size;
-    demo_item->letter = letter;
+    demo_item->width = width;
+    demo_item->height = height;
+    demo_item->paint = paint;
+    demo_item->closure = closure;
 
-    va_start (var_args, letter);
+    va_start (var_args, closure);
     first_property = va_arg (var_args, char*);
     if (first_property)
        g_object_set_valist ((GObject*) item, first_property, var_args);
@@ -66,7 +61,8 @@ goo_demo_item_new (GooCanvasItem      *parent,
        g_object_unref (item);
     }
 
-    goo_demo_item_move_to (item, x, y);
+    cairo_matrix_init_translate (&matrix, x, y);
+    goo_canvas_item_set_transform (item, &matrix);
 
     return item;
 }
@@ -84,8 +80,8 @@ goo_demo_item_update  (GooCanvasItemSimple *simple,
     /* Compute the new bounds. */
     simple->bounds.x1 = 0;
     simple->bounds.y1 = 0;
-    simple->bounds.x2 = demo_item->size;
-    simple->bounds.y2 = demo_item->size;
+    simple->bounds.x2 = demo_item->width;
+    simple->bounds.y2 = demo_item->height;
 
     /* Convert to device coordinates. */
     goo_canvas_item_simple_user_bounds_to_device (simple, cr, &simple->bounds);
@@ -99,50 +95,8 @@ goo_demo_item_paint (GooCanvasItemSimple *simple,
                     GooCanvasBounds     *bounds)
 {
     GooDemoItem *item = (GooDemoItem*) simple;
-    cairo_pattern_t *gradient;
-    cairo_text_extents_t extents;
-    int rad = (int) (item->size / 2);
-    int cx = item->size / 2;
-    int cy = cx;
-    double spot_angle = M_PI / 4.0;
-    double spot_rad = rad / 2.0;
-    char string[2];
-
-    cairo_save (cr);
-
-    gradient = cairo_pattern_create_radial (cx - spot_rad * cos (spot_angle),
-                                           cy - spot_rad * sin (spot_angle),
-                                           0.0,
-                                           cx - spot_rad * cos (spot_angle),
-                                           cy - spot_rad * sin (spot_angle),
-                                           rad + spot_rad);
-    cairo_pattern_add_color_stop_rgb (gradient, 0.0, 1.0, 1.0, 1.0);
-    cairo_pattern_add_color_stop_rgb (gradient, 1.0, 0.33, 0.33, 0.33);
-
-    cairo_set_source (cr, gradient);
-
-    cairo_arc (cr,
-              cx, cy,
-              rad, 0, 2 * M_PI);
-
-    cairo_fill (cr);
-
-    cairo_select_font_face (cr, "mono",
-                           CAIRO_FONT_SLANT_NORMAL,
-                           CAIRO_FONT_WEIGHT_BOLD);
-    cairo_set_font_size (cr, 1.8 * rad);
-
-    string[0] = item->letter;
-    string[1] = '\0';
-    cairo_text_extents (cr, string, &extents);
-    cairo_move_to (cr,
-                  cx - extents.width / 2 - extents.x_bearing,
-                  cy - extents.height / 2 - extents.y_bearing);
-
-    cairo_set_source_rgb (cr, 0.2, 0.3, 0.8);
-    cairo_show_text (cr, string);
-
-    cairo_restore (cr);
+
+    item->paint (cr, item->closure, item->width, item->height);
 }
 
 /* Hit detection. This should check if the given coordinate (in the item's
@@ -157,8 +111,8 @@ goo_demo_item_get_item_at (GooCanvasItemSimple *simple,
 {
     GooDemoItem *demo_item = (GooDemoItem*) simple;
 
-    if (x < 0 || (x > demo_item->size)
-       || y < 0 || (y > demo_item->size))
+    if (x < 0 || (x > demo_item->width)
+       || y < 0 || (y > demo_item->height))
        return NULL;
 
     return (GooCanvasItem*) simple;