projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix audio clock restore, provide XMLNode::property (string) and speed up the property...
[ardour.git]
/
gtk2_ardour
/
canvas-simpleline.c
diff --git
a/gtk2_ardour/canvas-simpleline.c
b/gtk2_ardour/canvas-simpleline.c
index e776d46ca7b955411496de99734a1dfd1ad2ce3a..b65693a54806cc1dcb16d7e90cd976e8a00213b8 100644
(file)
--- a/
gtk2_ardour/canvas-simpleline.c
+++ b/
gtk2_ardour/canvas-simpleline.c
@@
-172,8
+172,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 */
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
}
static void
@@
-182,7
+180,7
@@
gnome_canvas_simpleline_destroy (GtkObject *object)
GnomeCanvasSimpleLine *line;
g_return_if_fail (object != NULL);
GnomeCanvasSimpleLine *line;
g_return_if_fail (object != NULL);
- g_return_if_fail (GNOME_IS_CANVAS_LINE (object));
+ g_return_if_fail (GNOME_IS_CANVAS_
SIMPLE
LINE (object));
line = GNOME_CANVAS_SIMPLELINE (object);
line = GNOME_CANVAS_SIMPLELINE (object);
@@
-287,6
+285,7
@@
gnome_canvas_simpleline_set_property (GObject *object,
case PROP_COLOR_RGBA:
if (simpleline->color != g_value_get_uint(value)) {
simpleline->color = g_value_get_uint(value);
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;
update = TRUE;
}
break;
@@
-377,8
+376,8
@@
gnome_canvas_simpleline_render (GnomeCanvasItem *item,
buf->is_bg = FALSE;
}
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;
begin = simpleline->bbox_ulx;
end = simpleline->bbox_lrx;
@@
-388,7
+387,7
@@
gnome_canvas_simpleline_render (GnomeCanvasItem *item,
PAINT_HORIZA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a,
begin, end, simpleline->bbox_uly);
} else {
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);
}
}
begin, simpleline->bbox_uly, simpleline->bbox_lry);
}
}