Put images on the fade in/out menus. Fixes #3411.

[ardour.git] / gtk2_ardour / canvas-simpleline.c

diff --git a/gtk2_ardour/canvas-simpleline.c b/gtk2_ardour/canvas-simpleline.c
index 3aeee4b32ab7c0776f36bd5136b4f750ed618699..7bff05487e9c8121654a8dc8e4dd9247c345849a 100644 (file)
--- a/gtk2_ardour/canvas-simpleline.c
+++ b/gtk2_ardour/canvas-simpleline.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <math.h>
+#include <cairo.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 
 #include "canvas-simpleline.h"
@@ -103,7 +104,7 @@ gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class)
 
        gobject_class->set_property = gnome_canvas_simpleline_set_property;
        gobject_class->get_property = gnome_canvas_simpleline_get_property;
-       
+
        g_object_class_install_property (gobject_class,
                                         PROP_X1,
                                         g_param_spec_double ("x1",
@@ -112,8 +113,8 @@ gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class)
                                                              -G_MAXDOUBLE,
                                                              G_MAXDOUBLE,
                                                              0.0,
-                                                             G_PARAM_READWRITE));  
-       
+                                                             G_PARAM_READWRITE));
+
        g_object_class_install_property (gobject_class,
                                         PROP_Y1,
                                         g_param_spec_double ("y1",
@@ -122,8 +123,8 @@ gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class)
                                                              -G_MAXDOUBLE,
                                                              G_MAXDOUBLE,
                                                              0.0,
-                                                             G_PARAM_READWRITE));  
-       
+                                                             G_PARAM_READWRITE));
+
 
        g_object_class_install_property (gobject_class,
                                         PROP_X2,
@@ -133,8 +134,8 @@ gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class)
                                                              -G_MAXDOUBLE,
                                                              G_MAXDOUBLE,
                                                              0.0,
-                                                             G_PARAM_READWRITE));  
-       
+                                                             G_PARAM_READWRITE));
+
        g_object_class_install_property (gobject_class,
                                         PROP_Y2,
                                         g_param_spec_double ("y2",
@@ -143,7 +144,7 @@ gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class)
                                                              -G_MAXDOUBLE,
                                                              G_MAXDOUBLE,
                                                              0.0,
-                                                             G_PARAM_READWRITE));  
+                                                             G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class,
                                         PROP_COLOR_RGBA,
                                         g_param_spec_uint ("color_rgba",
@@ -152,8 +153,8 @@ gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class)
                                                            0,
                                                            G_MAXUINT,
                                                            0,
-                                                           G_PARAM_READWRITE));  
-       
+                                                           G_PARAM_READWRITE));
+
        object_class->destroy = gnome_canvas_simpleline_destroy;
 
        item_class->update = gnome_canvas_simpleline_update;
@@ -172,8 +173,6 @@ gnome_canvas_simpleline_init (GnomeCanvasSimpleLine *simpleline)
        simpleline->y2 = 0.0;
        simpleline->color = RGBA_TO_UINT(98,123,174,241);
        simpleline->horizontal = TRUE; /* reset in the _update() method */
-       // GTK2FIX
-       // GNOME_CANVAS_ITEM(simpleline)->object.flags |= GNOME_CANVAS_ITEM_NO_AUTO_REDRAW;
 }
 
 static void
@@ -205,7 +204,7 @@ gnome_canvas_simpleline_bounds_world (GnomeCanvasItem *item, int* ix1, int* iy1,
        i1.y = y1;
        i2.x = x2;
        i2.y = y2;
-       
+
        gnome_canvas_item_i2w_affine (item, i2w);
        art_affine_point (&w1, &i1, i2w);
        art_affine_point (&w2, &i2, i2w);
@@ -226,7 +225,7 @@ gnome_canvas_simpleline_bounds_world (GnomeCanvasItem *item, int* ix1, int* iy1,
        }
 }
 
-static void 
+static void
 gnome_canvas_simpleline_reset_bounds (GnomeCanvasItem *item)
 {
        int Ix1, Ix2, Iy1, Iy2;
@@ -235,8 +234,8 @@ gnome_canvas_simpleline_reset_bounds (GnomeCanvasItem *item)
        gnome_canvas_update_bbox (item, Ix1, Iy1, Ix2, Iy2);
 }
 
-/* 
- * CANVAS CALLBACKS 
+/*
+ * CANVAS CALLBACKS
  */
 
 static void
@@ -246,6 +245,8 @@ gnome_canvas_simpleline_set_property (GObject      *object,
                                      GParamSpec   *pspec)
 
 {
+       (void) pspec;
+
        GnomeCanvasSimpleLine *simpleline;
        int update = FALSE;
        int bounds_changed = FALSE;
@@ -283,10 +284,11 @@ gnome_canvas_simpleline_set_property (GObject      *object,
                        bounds_changed = TRUE;
                }
                break;
-               
+
        case PROP_COLOR_RGBA:
                if (simpleline->color != g_value_get_uint(value)) {
                        simpleline->color = g_value_get_uint(value);
+                       UINT_TO_RGBA (simpleline->color, &simpleline->r, &simpleline->g, &simpleline->b, &simpleline->a);
                        update = TRUE;
                }
                break;
@@ -307,7 +309,7 @@ gnome_canvas_simpleline_get_property (GObject      *object,
 {
         g_return_if_fail (object != NULL);
         g_return_if_fail (GNOME_IS_CANVAS_SIMPLELINE (object));
-       
+
        GnomeCanvasSimpleLine *line = GNOME_CANVAS_SIMPLELINE (object);
 
        switch (prop_id) {
@@ -377,18 +379,18 @@ gnome_canvas_simpleline_render (GnomeCanvasItem *item,
                buf->is_bg = FALSE;
        }
 
-       // begin = MAX(simpleline->bbox_ulx,buf->rect.x0);
-       // end = MIN(simpleline->bbox_lrx,buf->rect.x1);
-       
+       //begin = MAX(simpleline->bbox_ulx,buf->rect.x0);
+       //end = MIN(simpleline->bbox_lrx,buf->rect.x1);
+
        begin = simpleline->bbox_ulx;
        end = simpleline->bbox_lrx;
 
        if (simpleline->color != 0) {
                if (simpleline->horizontal) {
-                       PAINT_HORIZA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a, 
+                       PAINT_HORIZA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a,
                                     begin, end, simpleline->bbox_uly);
                } else {
-                       PAINT_VERTA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a, 
+                       PAINT_VERTA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a,
                                    begin, simpleline->bbox_uly, simpleline->bbox_lry);
                }
        }
@@ -401,15 +403,54 @@ gnome_canvas_simpleline_draw (GnomeCanvasItem *item,
                            int width, int height)
 {
        GnomeCanvasSimpleLine *simpleline;
+       cairo_t* cr;
+       double ulx;
+       double uly;
+       double lrx;
+       double lry;
 
        simpleline = GNOME_CANVAS_SIMPLELINE (item);
 
-       if (parent_class->draw) {
-               (* parent_class->draw) (item, drawable, x, y, width, height);
+       cr = gdk_cairo_create (drawable);
+
+       if (x > simpleline->bbox_ulx) {
+               ulx = x;
+       } else {
+               ulx = simpleline->bbox_ulx;
+       }
+
+       if (y > simpleline->bbox_uly) {
+               uly = y;
+       } else {
+               uly = simpleline->bbox_uly;
+       }
+
+       if (x + width > simpleline->bbox_lrx) {
+               lrx = simpleline->bbox_lrx;
+       } else {
+               lrx = x + width;
+       }
+
+       if (y + height > simpleline->bbox_lry) {
+               lry = simpleline->bbox_lry;
+       } else {
+               lry = y + height;
        }
 
-       fprintf (stderr, "please don't use the CanvasSimpleLine item in a non-aa Canvas\n");
-       abort ();
+       ulx -= x;
+       uly -= y;
+       lrx -= x;
+       lry -= y;
+
+       cairo_set_source_rgba (cr,
+                              simpleline->r/255.0,
+                              simpleline->g/255.0,
+                              simpleline->b/255.0,
+                              simpleline->a/255.0);
+       cairo_set_line_width (cr, 1);
+       cairo_move_to (cr, ulx+0.5, uly+0.5);
+       cairo_line_to (cr, lrx+0.5, lry+0.5);
+       cairo_stroke (cr);
 }
 
 static void
@@ -426,6 +467,9 @@ gnome_canvas_simpleline_bounds (GnomeCanvasItem *item, double *x1, double *y1, d
 static double
 gnome_canvas_simpleline_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item)
 {
+       (void) cx;
+       (void) cy;
+
        GnomeCanvasSimpleLine *simpleline;
        double x1, y1, x2, y2;
        double dx, dy;
@@ -434,17 +478,17 @@ gnome_canvas_simpleline_point (GnomeCanvasItem *item, double x, double y, int cx
 
        *actual_item = item;
 
-       /* Find the bounds for the rectangle plus its outline width */
+       /* Find the bounds for the line plus its outline width */
 
        gnome_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2);
 
-       /* Is point inside rectangle */
-       
+       /* Is point inside line */
+
        if ((x >= x1) && (y >= y1) && (x <= x2) && (y <= y2)) {
                return 0.0;
        }
 
-       /* Point is outside rectangle */
+       /* Point is outside line */
 
        if (x < x1)
                dx = x1 - x;