[gnumeric] Printing: fix printing of sheet objects.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnumeric] Printing: fix printing of sheet objects.
- Date: Fri, 25 Sep 2009 15:17:21 +0000 (UTC)
commit 4fa284dec77631c3d3d644d33fb386ed8b84db8d
Author: Morten Welinder <terra gnome org>
Date: Fri Sep 25 11:16:35 2009 -0400
Printing: fix printing of sheet objects.
ChangeLog | 10 ++++++++--
NEWS | 2 ++
src/gnm-so-filled.c | 6 +-----
src/gnm-so-line.c | 9 ++-------
4 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8e6a7e5..cc3ce1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2009-09-25 Morten Welinder <terra gnome org>
+
+ * src/gnm-so-line.c (gnm_so_line_draw_cairo,
+ gnm_so_filled_draw_cairo): Fix setting of colour.
+ (gnm_so_line_draw_cairo): Fix setting of line width.
+
2009-09-25 Jean Brefort <jean brefort normalesup org>
- * src/sheet-control-gui.c (scg_redraw_headers): fixed column headers update
- when scrolled.
+ * src/sheet-control-gui.c (scg_redraw_headers): fixed column
+ headers update when scrolled.
2009-09-24 Morten Welinder <terra gnome org>
diff --git a/NEWS b/NEWS
index 3c2a6ec..0c43472 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,8 @@ Morten:
* Make auto-format templates use the sax parser.
* Improve consistency when moving toolbars around.
* Fix translation problem with toolbar menu. [#587250]
+ * Fix printing of coloured sheet objects.
+ * Fix printing of lines and arrows.
--------------------------------------------------------------------------
Gnumeric 1.9.13
diff --git a/src/gnm-so-filled.c b/src/gnm-so-filled.c
index 56f0362..fe35104 100644
--- a/src/gnm-so-filled.c
+++ b/src/gnm-so-filled.c
@@ -274,11 +274,7 @@ gnm_so_filled_draw_cairo (SheetObject const *so, cairo_t *cr,
}
/* Draw the line */
cairo_set_line_width (cr, (style->line.width)? style->line.width: 1.);
- cairo_set_source_rgba (cr,
- GO_COLOR_UINT_R(style->line.color),
- GO_COLOR_UINT_B(style->line.color),
- GO_COLOR_UINT_G(style->line.color),
- GO_COLOR_UINT_A(style->line.color));
+ cairo_set_source_rgba (cr, GO_COLOR_TO_CAIRO (style->line.color));
cairo_stroke (cr);
/* Draw the text. */
if (sof->text != NULL && *(sof->text) != '\0') {
diff --git a/src/gnm-so-line.c b/src/gnm-so-line.c
index 5ab3f94..a2b95b1 100644
--- a/src/gnm-so-line.c
+++ b/src/gnm-so-line.c
@@ -223,12 +223,7 @@ gnm_so_line_draw_cairo (SheetObject const *so, cairo_t *cr,
return;
}
- cairo_set_line_width (cr, (style->width)? style->width: 1.);
- cairo_set_source_rgba (cr,
- GO_COLOR_UINT_R(style->color),
- GO_COLOR_UINT_B(style->color),
- GO_COLOR_UINT_G(style->color),
- GO_COLOR_UINT_A(style->color));
+ cairo_set_source_rgba (cr, GO_COLOR_TO_CAIRO (style->color));
if (sol->end_arrow.c > 0.) {
double phi;
@@ -254,7 +249,7 @@ gnm_so_line_draw_cairo (SheetObject const *so, cairo_t *cr,
y2 -= sol->end_arrow.a * cos (phi);
}
- cairo_set_line_width (cr, style->width);
+ cairo_set_line_width (cr, (style->width)? style->width: 1.);
cairo_new_path (cr);
cairo_move_to (cr, x1, y1);
cairo_line_to (cr, x2, y2);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]