aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorArturo Espinosa <unammx@src.gnome.org>1998-05-09 08:18:26 +0800
committerArturo Espinosa <unammx@src.gnome.org>1998-05-09 08:18:26 +0800
commit667ddb5e5f2dbffca19affdb90cf3125b13629ee (patch)
tree6ac72314cb9646cb25a05901f10adac68c4afdf5 /calendar
parenta9b1af2b26c0be96173149078b4e98b2b1d3aac2 (diff)
downloadgsoc2013-evolution-667ddb5e5f2dbffca19affdb90cf3125b13629ee.tar
gsoc2013-evolution-667ddb5e5f2dbffca19affdb90cf3125b13629ee.tar.gz
gsoc2013-evolution-667ddb5e5f2dbffca19affdb90cf3125b13629ee.tar.bz2
gsoc2013-evolution-667ddb5e5f2dbffca19affdb90cf3125b13629ee.tar.lz
gsoc2013-evolution-667ddb5e5f2dbffca19affdb90cf3125b13629ee.tar.xz
gsoc2013-evolution-667ddb5e5f2dbffca19affdb90cf3125b13629ee.tar.zst
gsoc2013-evolution-667ddb5e5f2dbffca19affdb90cf3125b13629ee.zip
Further work on getting nice pixmaps displayed -mig
svn path=/trunk/; revision=210
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gncal-full-day.c31
-rw-r--r--calendar/gui/gncal-full-day.c31
2 files changed, 34 insertions, 28 deletions
diff --git a/calendar/gncal-full-day.c b/calendar/gncal-full-day.c
index 723e9430d9..47d5ca8d39 100644
--- a/calendar/gncal-full-day.c
+++ b/calendar/gncal-full-day.c
@@ -289,29 +289,31 @@ child_draw_decor (GncalFullDay *fullday, Child *child, GdkRectangle *area)
GdkRectangle rect, dest;
int ry = 0;
- rect.x = child->width;
+ 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){
- gdk_window_copy_area (child->decor_window,
- fullday->recur_gc,
- 0, ry,
- pixmap_recur, 0, 0,
- DECOR_WIDTH, DECOR_HEIGHT);
+ gdk_draw_pixmap (child->decor_window,
+ fullday->recur_gc,
+ pixmap_recur,
+ 0, 0,
+ 0, ry,
+ DECOR_WIDTH, DECOR_HEIGHT);
ry += DECOR_HEIGHT;
}
if (ico->dalarm.enabled || ico->malarm.enabled || ico->palarm.enabled || ico->aalarm.enabled){
- printf ("PINTANDO ALARMA\n");
- gdk_window_copy_area (child->decor_window,
- fullday->bell_gc,
- 0, ry,
- pixmap_bell, 0, 0,
- DECOR_WIDTH, DECOR_HEIGHT);
+ gdk_draw_pixmap (child->decor_window,
+ fullday->bell_gc,
+ pixmap_bell,
+ 0, 0,
+ 0, ry,
+ DECOR_WIDTH, DECOR_HEIGHT);
ry += DECOR_HEIGHT;
}
}
@@ -363,6 +365,7 @@ child_draw (GncalFullDay *fullday, Child *child, GdkRectangle *area, int draw_ch
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;
diff --git a/calendar/gui/gncal-full-day.c b/calendar/gui/gncal-full-day.c
index 723e9430d9..47d5ca8d39 100644
--- a/calendar/gui/gncal-full-day.c
+++ b/calendar/gui/gncal-full-day.c
@@ -289,29 +289,31 @@ child_draw_decor (GncalFullDay *fullday, Child *child, GdkRectangle *area)
GdkRectangle rect, dest;
int ry = 0;
- rect.x = child->width;
+ 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){
- gdk_window_copy_area (child->decor_window,
- fullday->recur_gc,
- 0, ry,
- pixmap_recur, 0, 0,
- DECOR_WIDTH, DECOR_HEIGHT);
+ gdk_draw_pixmap (child->decor_window,
+ fullday->recur_gc,
+ pixmap_recur,
+ 0, 0,
+ 0, ry,
+ DECOR_WIDTH, DECOR_HEIGHT);
ry += DECOR_HEIGHT;
}
if (ico->dalarm.enabled || ico->malarm.enabled || ico->palarm.enabled || ico->aalarm.enabled){
- printf ("PINTANDO ALARMA\n");
- gdk_window_copy_area (child->decor_window,
- fullday->bell_gc,
- 0, ry,
- pixmap_bell, 0, 0,
- DECOR_WIDTH, DECOR_HEIGHT);
+ gdk_draw_pixmap (child->decor_window,
+ fullday->bell_gc,
+ pixmap_bell,
+ 0, 0,
+ 0, ry,
+ DECOR_WIDTH, DECOR_HEIGHT);
ry += DECOR_HEIGHT;
}
}
@@ -363,6 +365,7 @@ child_draw (GncalFullDay *fullday, Child *child, GdkRectangle *area, int draw_ch
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;