From 224c97090305d7fbe20d76d50001118a4ade959b Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Wed, 16 Aug 2000 18:46:39 +0000 Subject: get rid of COLOR_TEXT. (struct _EIconBarItem): add pixbuf member to hold 2000-08-16 Larry Ewing * e-icon-bar.h (enum): get rid of COLOR_TEXT. (struct _EIconBarItem): add pixbuf member to hold unmodified pixbuf. * e-icon-bar.c (e_icon_bar_style_set): update the image and the colors based on the new style. (e_icon_bar_add_item): store the full alpha pixbuf so that we can update the background color if the style changes. Use the style colors where appropriate. (e_icon_bar_on_editing_stopped): revert to style colors. (e_icon_bar_on_editing_started): use style fg instead of COLOR_TEXT. * e-shortcut-bar.c (e_shortcut_bar_add_group): add an #ifndef E_USE_STYLES around the call to e_shortcut_bar_set_canvas_style to allow people to test out the style stuff that is in progress. svn path=/trunk/; revision=4856 --- widgets/shortcut-bar/e-icon-bar.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'widgets/shortcut-bar/e-icon-bar.h') diff --git a/widgets/shortcut-bar/e-icon-bar.h b/widgets/shortcut-bar/e-icon-bar.h index 72d64ad890..90d9f5a2cf 100644 --- a/widgets/shortcut-bar/e-icon-bar.h +++ b/widgets/shortcut-bar/e-icon-bar.h @@ -45,6 +45,10 @@ struct _EIconBarItem GnomeCanvasItem *text; GnomeCanvasItem *image; + /* This holds the original pixbuf so that we can blend + to the background if the style changes */ + GdkPixbuf *pixbuf; + /* This is user data attached to the item, e.g. a URL. */ gpointer data; GtkDestroyNotify destroy; @@ -73,7 +77,6 @@ typedef enum /* These index our colors array. */ typedef enum { - E_ICON_BAR_COLOR_TEXT, E_ICON_BAR_COLOR_EDITING_TEXT, E_ICON_BAR_COLOR_EDITING_RECT, E_ICON_BAR_COLOR_EDITING_RECT_OUTLINE, -- cgit v1.2.3