Paint the decorations correctly. (child_draw_decor): Paint the

1998-05-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* gncal-full-day.c (child_draw): Paint the decorations correctly.
	(child_draw_decor): Paint the recurrence/bell icons correctly.

svn path=/trunk/; revision=241

3 files changed, 113 insertions, 106 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8efaab7283..b128d48ed9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+1998-05-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gncal-full-day.c (child_draw): Paint the decorations correctly.
+	(child_draw_decor): Paint the recurrence/bell icons correctly.
+
 1998-05-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* eventedit.c (ee_rp_init_rule): Use the contents of
diff --git a/calendar/gncal-full-day.c b/calendar/gncal-full-day.c
index 618d1c039d..ea4fc575da 100644
--- a/calendar/gncal-full-day.c
+++ b/calendar/gncal-full-day.c
@@ -286,22 +286,13 @@ child_unrealize (GncalFullDay *fullday, Child *child)
 }
 
 static void
-child_draw_decor (GncalFullDay *fullday, Child *child, GdkRectangle *area)
+child_draw_decor (GncalFullDay *fullday, Child *child)
 {
 	iCalObject *ico = child->ico;
-	GdkRectangle rect;
 	int ry = 0;
 
-	rect.x = child->width - child->decor_width;
-	rect.y = 0;
-	rect.width = child->decor_width;
-	rect.height = child->decor_height;
-
-#if 0
-	if (!gdk_rectangle_intersect (&rect, area, &dest))
-		return;
-#endif
-	if (ico->recur){
+	if (ico->recur) {
+		gdk_gc_set_clip_origin (fullday->recur_gc, 0, ry);
 		gdk_draw_pixmap (child->decor_window,
 				 fullday->recur_gc,
 				 pixmap_recur,
@@ -310,7 +301,9 @@ child_draw_decor (GncalFullDay *fullday, Child *child, GdkRectangle *area)
 				 DECOR_WIDTH, DECOR_HEIGHT);
 		ry += DECOR_HEIGHT;
 	}
-	if (ico->dalarm.enabled || ico->malarm.enabled || ico->palarm.enabled || ico->aalarm.enabled){
+
+	if (ico->dalarm.enabled || ico->malarm.enabled || ico->palarm.enabled || ico->aalarm.enabled) {
+		gdk_gc_set_clip_origin (fullday->bell_gc, 0, ry);
 		gdk_draw_pixmap (child->decor_window,
 				 fullday->bell_gc,
 				 pixmap_bell,
@@ -322,58 +315,69 @@ child_draw_decor (GncalFullDay *fullday, Child *child, GdkRectangle *area)
 }
 
 static void
-child_draw (GncalFullDay *fullday, Child *child, GdkRectangle *area, int draw_child)
+child_draw (GncalFullDay *fullday, Child *child, GdkRectangle *area, GdkWindow *window, int draw_child)
 {
 	GdkRectangle arect, rect, dest;
 	int has_focus;
 
-	if (!area) {
-		arect.x = 0;
-		arect.y = 0;
-
-		arect.width = child->width;
-		arect.height = child->height;
-
-		area = &arect;
-	}
-
 	has_focus = GTK_WIDGET_HAS_FOCUS (child->widget);
 
-	/* Left handle */
+	if (!window || (window == child->window)) {
+		if (!area) {
+			arect.x = 0;
+			arect.y = 0;
+			arect.width = child->width;
+			arect.height = child->height;
 
-	rect.x = 0;
-	rect.y = has_focus ? HANDLE_SIZE : 0;
-	rect.width = HANDLE_SIZE;
-	rect.height = has_focus ? (child->height - 2 * HANDLE_SIZE) : child->height;
-
-	if (gdk_rectangle_intersect (&rect, area, &dest))
-		view_utils_draw_textured_frame (GTK_WIDGET (fullday), child->window, &rect, GTK_SHADOW_OUT);
+			area = &arect;
+		}
 
-	if (has_focus) {
-		/* Top handle */
+		/* Left handle */
 
 		rect.x = 0;
-		rect.y = 0;
-		rect.width = child->width - child->decor_width;
-		rect.height = HANDLE_SIZE;
+		rect.y = has_focus ? HANDLE_SIZE : 0;
+		rect.width = HANDLE_SIZE;
+		rect.height = has_focus ? (child->height - 2 * HANDLE_SIZE) : child->height;
 
 		if (gdk_rectangle_intersect (&rect, area, &dest))
 			view_utils_draw_textured_frame (GTK_WIDGET (fullday), child->window, &rect, GTK_SHADOW_OUT);
 
-		/* Bottom handle */
+		if (has_focus) {
+			/* Top handle */
 
-		rect.y = child->height - HANDLE_SIZE;
+			rect.x = 0;
+			rect.y = 0;
+			rect.width = child->width - child->decor_width;
+			rect.height = HANDLE_SIZE;
 
-		if (gdk_rectangle_intersect (&rect, area, &dest))
-			view_utils_draw_textured_frame (GTK_WIDGET (fullday), child->window, &rect, GTK_SHADOW_OUT);
-	}
+			if (gdk_rectangle_intersect (&rect, area, &dest))
+				view_utils_draw_textured_frame (GTK_WIDGET (fullday), child->window,
+								&rect, GTK_SHADOW_OUT);
 
-	child_draw_decor (fullday, child, area);
-	if (draw_child) {
-		area->x -= HANDLE_SIZE;
-		area->y -= has_focus ? HANDLE_SIZE : 0;
-		gtk_widget_draw (child->widget, area);
+			/* Bottom handle */
+
+			rect.y = child->height - HANDLE_SIZE;
+
+			if (gdk_rectangle_intersect (&rect, area, &dest))
+				view_utils_draw_textured_frame (GTK_WIDGET (fullday), child->window,
+								&rect, GTK_SHADOW_OUT);
+		}
+
+	} else if (!window || (window == child->decor_window)) {
+		if (!area) {
+			arect.x = 0;
+			arect.y = 0;
+			arect.width = child->decor_width;
+			arect.height = child->decor_height;
+
+			area = &arect;
+		}
+
+		child_draw_decor (fullday, child);
 	}
+
+	if (draw_child)
+		gtk_widget_draw (child->widget, NULL);
 }
 
 static void
@@ -1421,10 +1425,7 @@ gncal_full_day_draw (GtkWidget *widget, GdkRectangle *area)
 		rect.height = child->height;
 
 		if (gdk_rectangle_intersect (&rect, area, &dest)) {
-			dest.x -= child->x;
-			dest.y -= child->y;
-
-			child_draw (fullday, child, &dest, TRUE);
+			child_draw (fullday, child, NULL, NULL, TRUE);
 		}
 	}
 }
@@ -2010,7 +2011,7 @@ gncal_full_day_expose (GtkWidget *widget, GdkEventExpose *event)
 		child = find_child_by_window (fullday, event->window, &on_text);
 
 		if (child && !on_text)
-			child_draw (fullday, child, &event->area, FALSE);
+			child_draw (fullday, child, &event->area, event->window, FALSE);
 	}
 
 	return FALSE;
@@ -2160,7 +2161,7 @@ gncal_full_day_update (GncalFullDay *fullday, iCalObject *ico, int flags)
 	/* If child was found and nothing but the summary changed, we can just paint the child and return */
 
 	if (children && !(flags & ~CHANGE_SUMMARY)) {
-		child_draw (fullday, child, NULL, TRUE);
+		child_draw (fullday, child, NULL, NULL, TRUE);
 		return;
 	}
 
diff --git a/calendar/gui/gncal-full-day.c b/calendar/gui/gncal-full-day.c
index 618d1c039d..ea4fc575da 100644
--- a/calendar/gui/gncal-full-day.c
+++ b/calendar/gui/gncal-full-day.c
@@ -286,22 +286,13 @@ child_unrealize (GncalFullDay *fullday, Child *child)
 }
 
 static void
-child_draw_decor (GncalFullDay *fullday, Child *child, GdkRectangle *area)
+child_draw_decor (GncalFullDay *fullday, Child *child)
 {
 	iCalObject *ico = child->ico;
-	GdkRectangle rect;
 	int ry = 0;
 
-	rect.x = child->width - child->decor_width;
-	rect.y = 0;
-	rect.width = child->decor_width;
-	rect.height = child->decor_height;
-
-#if 0
-	if (!gdk_rectangle_intersect (&rect, area, &dest))
-		return;
-#endif
-	if (ico->recur){
+	if (ico->recur) {
+		gdk_gc_set_clip_origin (fullday->recur_gc, 0, ry);
 		gdk_draw_pixmap (child->decor_window,
 				 fullday->recur_gc,
 				 pixmap_recur,
@@ -310,7 +301,9 @@ child_draw_decor (GncalFullDay *fullday, Child *child, GdkRectangle *area)
 				 DECOR_WIDTH, DECOR_HEIGHT);
 		ry += DECOR_HEIGHT;
 	}
-	if (ico->dalarm.enabled || ico->malarm.enabled || ico->palarm.enabled || ico->aalarm.enabled){
+
+	if (ico->dalarm.enabled || ico->malarm.enabled || ico->palarm.enabled || ico->aalarm.enabled) {
+		gdk_gc_set_clip_origin (fullday->bell_gc, 0, ry);
 		gdk_draw_pixmap (child->decor_window,
 				 fullday->bell_gc,
 				 pixmap_bell,
@@ -322,58 +315,69 @@ child_draw_decor (GncalFullDay *fullday, Child *child, GdkRectangle *area)
 }
 
 static void
-child_draw (GncalFullDay *fullday, Child *child, GdkRectangle *area, int draw_child)
+child_draw (GncalFullDay *fullday, Child *child, GdkRectangle *area, GdkWindow *window, int draw_child)
 {
 	GdkRectangle arect, rect, dest;
 	int has_focus;
 
-	if (!area) {
-		arect.x = 0;
-		arect.y = 0;
-
-		arect.width = child->width;
-		arect.height = child->height;
-
-		area = &arect;
-	}
-
 	has_focus = GTK_WIDGET_HAS_FOCUS (child->widget);
 
-	/* Left handle */
+	if (!window || (window == child->window)) {
+		if (!area) {
+			arect.x = 0;
+			arect.y = 0;
+			arect.width = child->width;
+			arect.height = child->height;
 
-	rect.x = 0;
-	rect.y = has_focus ? HANDLE_SIZE : 0;
-	rect.width = HANDLE_SIZE;
-	rect.height = has_focus ? (child->height - 2 * HANDLE_SIZE) : child->height;
-
-	if (gdk_rectangle_intersect (&rect, area, &dest))
-		view_utils_draw_textured_frame (GTK_WIDGET (fullday), child->window, &rect, GTK_SHADOW_OUT);
+			area = &arect;
+		}
 
-	if (has_focus) {
-		/* Top handle */
+		/* Left handle */
 
 		rect.x = 0;
-		rect.y = 0;
-		rect.width = child->width - child->decor_width;
-		rect.height = HANDLE_SIZE;
+		rect.y = has_focus ? HANDLE_SIZE : 0;
+		rect.width = HANDLE_SIZE;
+		rect.height = has_focus ? (child->height - 2 * HANDLE_SIZE) : child->height;
 
 		if (gdk_rectangle_intersect (&rect, area, &dest))
 			view_utils_draw_textured_frame (GTK_WIDGET (fullday), child->window, &rect, GTK_SHADOW_OUT);
 
-		/* Bottom handle */
+		if (has_focus) {
+			/* Top handle */
 
-		rect.y = child->height - HANDLE_SIZE;
+			rect.x = 0;
+			rect.y = 0;
+			rect.width = child->width - child->decor_width;
+			rect.height = HANDLE_SIZE;
 
-		if (gdk_rectangle_intersect (&rect, area, &dest))
-			view_utils_draw_textured_frame (GTK_WIDGET (fullday), child->window, &rect, GTK_SHADOW_OUT);
-	}
+			if (gdk_rectangle_intersect (&rect, area, &dest))
+				view_utils_draw_textured_frame (GTK_WIDGET (fullday), child->window,
+								&rect, GTK_SHADOW_OUT);
 
-	child_draw_decor (fullday, child, area);
-	if (draw_child) {
-		area->x -= HANDLE_SIZE;
-		area->y -= has_focus ? HANDLE_SIZE : 0;
-		gtk_widget_draw (child->widget, area);
+			/* Bottom handle */
+
+			rect.y = child->height - HANDLE_SIZE;
+
+			if (gdk_rectangle_intersect (&rect, area, &dest))
+				view_utils_draw_textured_frame (GTK_WIDGET (fullday), child->window,
+								&rect, GTK_SHADOW_OUT);
+		}
+
+	} else if (!window || (window == child->decor_window)) {
+		if (!area) {
+			arect.x = 0;
+			arect.y = 0;
+			arect.width = child->decor_width;
+			arect.height = child->decor_height;
+
+			area = &arect;
+		}
+
+		child_draw_decor (fullday, child);
 	}
+
+	if (draw_child)
+		gtk_widget_draw (child->widget, NULL);
 }
 
 static void
@@ -1421,10 +1425,7 @@ gncal_full_day_draw (GtkWidget *widget, GdkRectangle *area)
 		rect.height = child->height;
 
 		if (gdk_rectangle_intersect (&rect, area, &dest)) {
-			dest.x -= child->x;
-			dest.y -= child->y;
-
-			child_draw (fullday, child, &dest, TRUE);
+			child_draw (fullday, child, NULL, NULL, TRUE);
 		}
 	}
 }
@@ -2010,7 +2011,7 @@ gncal_full_day_expose (GtkWidget *widget, GdkEventExpose *event)
 		child = find_child_by_window (fullday, event->window, &on_text);
 
 		if (child && !on_text)
-			child_draw (fullday, child, &event->area, FALSE);
+			child_draw (fullday, child, &event->area, event->window, FALSE);
 	}
 
 	return FALSE;
@@ -2160,7 +2161,7 @@ gncal_full_day_update (GncalFullDay *fullday, iCalObject *ico, int flags)
 	/* If child was found and nothing but the summary changed, we can just paint the child and return */
 
 	if (children && !(flags & ~CHANGE_SUMMARY)) {
-		child_draw (fullday, child, NULL, TRUE);
+		child_draw (fullday, child, NULL, NULL, TRUE);
 		return;
 	}