comparison src/toolbar-x.c @ 424:11054d720c21 r21-2-20

Import from CVS: tag r21-2-20
author cvs
date Mon, 13 Aug 2007 11:26:11 +0200
parents 697ef44129c6
children
comparison
equal deleted inserted replaced
423:28d9c139be4c 424:11054d720c21
75 sheight -= 2 * border_width; 75 sheight -= 2 * border_width;
76 } 76 }
77 77
78 /* Draw the outline. */ 78 /* Draw the outline. */
79 x_output_shadows (f, sx, sy, swidth, sheight, top_shadow_gc, 79 x_output_shadows (f, sx, sy, swidth, sheight, top_shadow_gc,
80 bottom_shadow_gc, background_gc, shadow_thickness); 80 bottom_shadow_gc, background_gc, shadow_thickness,
81 EDGE_ALL);
81 82
82 /* Blank the middle. */ 83 /* Blank the middle. */
83 XFillRectangle (dpy, x_win, background_gc, sx + shadow_thickness, 84 XFillRectangle (dpy, x_win, background_gc, sx + shadow_thickness,
84 sy + shadow_thickness, swidth - shadow_thickness * 2, 85 sy + shadow_thickness, swidth - shadow_thickness * 2,
85 sheight - shadow_thickness * 2); 86 sheight - shadow_thickness * 2);
156 157
157 /* Draw the outline. */ 158 /* Draw the outline. */
158 x_output_shadows (f, tb->x + x_adj, tb->y + y_adj, 159 x_output_shadows (f, tb->x + x_adj, tb->y + y_adj,
159 tb->width + width_adj, tb->height + height_adj, 160 tb->width + width_adj, tb->height + height_adj,
160 top_shadow_gc, 161 top_shadow_gc,
161 bottom_shadow_gc, background_gc, shadow_thickness); 162 bottom_shadow_gc, background_gc, shadow_thickness,
163 EDGE_ALL);
162 164
163 /* Clear the pixmap area. */ 165 /* Clear the pixmap area. */
164 XFillRectangle (dpy, x_win, background_gc, tb->x + x_adj + shadow_thickness, 166 XFillRectangle (dpy, x_win, background_gc, tb->x + x_adj + shadow_thickness,
165 tb->y + y_adj + shadow_thickness, 167 tb->y + y_adj + shadow_thickness,
166 tb->width + width_adj - shadow_thickness * 2, 168 tb->width + width_adj - shadow_thickness * 2,
209 / 2); 211 / 2);
210 height = IMAGE_INSTANCE_PIXMAP_HEIGHT (p); 212 height = IMAGE_INSTANCE_PIXMAP_HEIGHT (p);
211 } 213 }
212 214
213 x_output_x_pixmap (f, XIMAGE_INSTANCE (instance), tb->x + x_offset, 215 x_output_x_pixmap (f, XIMAGE_INSTANCE (instance), tb->x + x_offset,
214 tb->y + y_offset, 0, 0, 0, 0, width, height, 216 tb->y + y_offset, 0, 0, width, height,
215 0, 0, 0, background_gc); 217 0, 0, background_gc);
216 } 218 }
217 else if (IMAGE_INSTANCE_TYPE (p) == IMAGE_TEXT) 219 else if (IMAGE_INSTANCE_TYPE (p) == IMAGE_TEXT)
218 { 220 {
219 /* #### We need to make the face used configurable. */ 221 /* #### We need to make the face used configurable. */
220 struct face_cachel *cachel = 222 struct face_cachel *cachel =