diff options
-rw-r--r-- | widgets/e-table/ChangeLog | 11 | ||||
-rw-r--r-- | widgets/e-table/e-cell-text.c | 18 | ||||
-rw-r--r-- | widgets/e-table/e-table-group-container.c | 310 | ||||
-rw-r--r-- | widgets/e-table/e-table-item.c | 70 | ||||
-rw-r--r-- | widgets/table/e-cell-text.c | 18 | ||||
-rw-r--r-- | widgets/table/e-table-group-container.c | 310 | ||||
-rw-r--r-- | widgets/table/e-table-item.c | 70 |
7 files changed, 797 insertions, 10 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index fa6afd4a3d..18016efb8b 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,14 @@ +2000-06-13 Christopher James Lahey <clahey@helixcode.com> + + * e-cell-text.c: Clip the contained text. + + * e-table-group-container.c: Did a first pass at grouped + printing. This works, but there's no fancy boxes or headers + around the groups. + + * e-table-item.c: Added will_fit function and added quantize + function to _height. + 2000-06-12 Federico Mena Quintero <federico@helixcode.com> * e-table-model.[ch]: Removed the freeze/thaw stuff for the model. diff --git a/widgets/e-table/e-cell-text.c b/widgets/e-table/e-cell-text.c index 9495ce86a9..7fe9cc1815 100644 --- a/widgets/e-table/e-cell-text.c +++ b/widgets/e-table/e-cell-text.c @@ -1167,9 +1167,23 @@ ect_print (ECellView *ecell_view, GnomePrintContext *context, } else { string = e_table_model_value_at (ecell_view->e_table_model, model_col, row); } - gnome_print_moveto(context, 0, (height - gnome_font_get_ascender(font) + gnome_font_get_descender(font)) / 2); + gnome_print_gsave(context); + if (gnome_print_moveto(context, 2, 2) == -1) + /* FIXME */; + if (gnome_print_lineto(context, width - 2, 2) == -1) + /* FIXME */; + if (gnome_print_lineto(context, width - 2, height - 2) == -1) + /* FIXME */; + if (gnome_print_lineto(context, 2, height - 2) == -1) + /* FIXME */; + if (gnome_print_lineto(context, 2, 2) == -1) + /* FIXME */; + if (gnome_print_clip(context) == -1) + /* FIXME */; + gnome_print_moveto(context, 2, (height - gnome_font_get_ascender(font) + gnome_font_get_descender(font)) / 2); gnome_print_setfont(context, font); gnome_print_show(context, string); + gnome_print_grestore(context); if (ect->filter) { g_free(string); } @@ -1180,7 +1194,7 @@ ect_print_height (ECellView *ecell_view, GnomePrintContext *context, int model_col, int view_col, int row, double width) { - return 12; + return 16; } /* diff --git a/widgets/e-table/e-table-group-container.c b/widgets/e-table/e-table-group-container.c index 25c7fb2132..8e48f447a8 100644 --- a/widgets/e-table/e-table-group-container.c +++ b/widgets/e-table/e-table-group-container.c @@ -48,6 +48,10 @@ typedef struct { gint count; } ETableGroupContainerChildNode; +static EPrintable * +etgc_get_printable (ETableGroup *etg); + + static void e_table_group_container_child_node_free (ETableGroupContainer *etgc, ETableGroupContainerChildNode *child_node) @@ -670,6 +674,7 @@ etgc_class_init (GtkObjectClass *object_class) e_group_class->get_selected_view_row = etgc_get_selected_view_row; e_group_class->unfocus = etgc_unfocus; e_group_class->get_focus_column = etgc_get_focus_column; + e_group_class->get_printable = etgc_get_printable; gtk_object_add_arg_type ("ETableGroupContainer::drawgrid", GTK_TYPE_BOOL, GTK_ARG_WRITABLE, ARG_TABLE_DRAW_GRID); @@ -807,3 +812,308 @@ e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, void *clos } } + +typedef struct { + ETableGroupContainer *etgc; + GList *child; + EPrintable *child_printable; +} ETGCPrintContext; + +#if 0 +#define CHECK(x) if((x) == -1) return -1; + +static gint +gp_draw_rect (GnomePrintContext *context, gdouble x, gdouble y, gdouble width, gdouble height, gdouble r, gdouble g, gdouble b) +{ + CHECK(gnome_print_moveto(context, x, y)); + CHECK(gnome_print_lineto(context, x + width, y)); + CHECK(gnome_print_lineto(context, x + width, y - height)); + CHECK(gnome_print_lineto(context, x, y - height)); + CHECK(gnome_print_lineto(context, x, y)); + return gnome_print_fill(context); +} +#endif + +static void +e_table_group_container_print_page (EPrintable *ep, + GnomePrintContext *context, + gdouble width, + gdouble height, + gboolean quantize, + ETGCPrintContext *groupcontext) +{ + gdouble yd = height; + gdouble child_height; + ETableGroupContainerChildNode *child_node; + GList *child; + EPrintable *child_printable; + + child_printable = groupcontext->child_printable; + child = groupcontext->child; + + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + else { + if (!child) { + return; + } else { + child_node = child->data; + child_printable = e_table_group_get_printable(child_node->child); + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + e_printable_reset(child_printable); + } + } + + while (1) { + child_height = e_printable_height(child_printable, context, width - 36, yd, quantize); + + if (gnome_print_gsave(context) == -1) + /* FIXME */; + if (gnome_print_translate(context, 36, yd - child_height) == -1) + /* FIXME */; + + if (gnome_print_moveto(context, 0, 0) == -1) + /* FIXME */; + if (gnome_print_lineto(context, width - 36, 0) == -1) + /* FIXME */; + if (gnome_print_lineto(context, width - 36, child_height) == -1) + /* FIXME */; + if (gnome_print_lineto(context, 0, child_height) == -1) + /* FIXME */; + if (gnome_print_lineto(context, 0, 0) == -1) + /* FIXME */; + if (gnome_print_clip(context) == -1) + /* FIXME */; + + e_printable_print_page(child_printable, context, width - 36, child_height, quantize); + + if (gnome_print_grestore(context) == -1) + /* FIXME */; + + yd -= child_height; + + if (e_printable_data_left(child_printable)) + break; + + child = child->next; + if (!child) { + child_printable = NULL; + break; + } + + child_node = child->data; + if (child_printable) + gtk_object_unref(GTK_OBJECT(child_printable)); + child_printable = e_table_group_get_printable(child_node->child); + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + e_printable_reset(child_printable); + } + + if (groupcontext->child_printable) + gtk_object_unref(GTK_OBJECT(groupcontext->child_printable)); + groupcontext->child_printable = child_printable; + groupcontext->child = child; + +} + +static gboolean +e_table_group_container_data_left (EPrintable *ep, + ETGCPrintContext *groupcontext) +{ + gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "data_left"); + return groupcontext->child != NULL; +} + +static void +e_table_group_container_reset (EPrintable *ep, + ETGCPrintContext *groupcontext) +{ + groupcontext->child = groupcontext->etgc->children; + if (groupcontext->child_printable) + gtk_object_unref(GTK_OBJECT(groupcontext->child_printable)); + groupcontext->child_printable = NULL; +} + +static gdouble +e_table_group_container_height (EPrintable *ep, + GnomePrintContext *context, + gdouble width, + gdouble max_height, + gboolean quantize, + ETGCPrintContext *groupcontext) +{ + gdouble height = 0; + gdouble child_height; + gdouble yd = max_height; + ETableGroupContainerChildNode *child_node; + GList *child; + EPrintable *child_printable; + + child_printable = groupcontext->child_printable; + child = groupcontext->child; + + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + else { + if (!child) { + gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height"); + return 0; + } else { + child_node = child->data; + child_printable = e_table_group_get_printable(child_node->child); + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + e_printable_reset(child_printable); + } + } + + while (1) { + child_height = e_printable_height(child_printable, context, width - 36, yd, quantize); + + height += child_height; + + if (yd != -1) { + if (!e_printable_will_fit(child_printable, context, width - 36, yd, quantize)) { + break; + } + + yd -= child_height; + } + + child = child->next; + if (!child) { + break; + } + + child_node = child->data; + if (child_printable) + gtk_object_unref(GTK_OBJECT(child_printable)); + child_printable = e_table_group_get_printable(child_node->child); + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + e_printable_reset(child_printable); + } + if (child_printable) + gtk_object_unref(GTK_OBJECT(child_printable)); + gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height"); + return height; +} + +static gboolean +e_table_group_container_will_fit (EPrintable *ep, + GnomePrintContext *context, + gdouble width, + gdouble max_height, + gboolean quantize, + ETGCPrintContext *groupcontext) +{ + gboolean will_fit = TRUE; + gdouble child_height; + gdouble yd = max_height; + ETableGroupContainerChildNode *child_node; + GList *child; + EPrintable *child_printable; + + child_printable = groupcontext->child_printable; + child = groupcontext->child; + + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + else { + if (!child) { + gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit"); + return will_fit; + } else { + child_node = child->data; + child_printable = e_table_group_get_printable(child_node->child); + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + e_printable_reset(child_printable); + } + } + + while (1) { + child_height = e_printable_height(child_printable, context, width - 36, yd, quantize); + + if (yd != -1) { + if (!e_printable_will_fit(child_printable, context, width - 36, yd, quantize)) { + will_fit = FALSE; + break; + } + + yd -= child_height; + } + + child = child->next; + if (!child) { + break; + } + + child_node = child->data; + if (child_printable) + gtk_object_unref(GTK_OBJECT(child_printable)); + child_printable = e_table_group_get_printable(child_node->child); + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + e_printable_reset(child_printable); + } + + if (child_printable) + gtk_object_unref(GTK_OBJECT(child_printable)); + + gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit"); + return will_fit; +} + +static void +e_table_group_container_printable_destroy (GtkObject *object, + ETGCPrintContext *groupcontext) +{ + gtk_object_unref(GTK_OBJECT(groupcontext->etgc)); + if (groupcontext->child_printable) + gtk_object_ref(GTK_OBJECT(groupcontext->child_printable)); + g_free(groupcontext); +} + +static EPrintable * +etgc_get_printable (ETableGroup *etg) +{ + ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg); + EPrintable *printable = e_printable_new(); + ETGCPrintContext *groupcontext; + + groupcontext = g_new(ETGCPrintContext, 1); + groupcontext->etgc = etgc; + gtk_object_ref(GTK_OBJECT(etgc)); + groupcontext->child = etgc->children; + groupcontext->child_printable = NULL; + + gtk_signal_connect (GTK_OBJECT(printable), + "print_page", + GTK_SIGNAL_FUNC(e_table_group_container_print_page), + groupcontext); + gtk_signal_connect (GTK_OBJECT(printable), + "data_left", + GTK_SIGNAL_FUNC(e_table_group_container_data_left), + groupcontext); + gtk_signal_connect (GTK_OBJECT(printable), + "reset", + GTK_SIGNAL_FUNC(e_table_group_container_reset), + groupcontext); + gtk_signal_connect (GTK_OBJECT(printable), + "height", + GTK_SIGNAL_FUNC(e_table_group_container_height), + groupcontext); + gtk_signal_connect (GTK_OBJECT(printable), + "will_fit", + GTK_SIGNAL_FUNC(e_table_group_container_will_fit), + groupcontext); + gtk_signal_connect (GTK_OBJECT(printable), + "destroy", + GTK_SIGNAL_FUNC(e_table_group_container_printable_destroy), + groupcontext); + + return printable; +} diff --git a/widgets/e-table/e-table-item.c b/widgets/e-table/e-table-item.c index 0de4181cdf..5167c794e6 100644 --- a/widgets/e-table/e-table-item.c +++ b/widgets/e-table/e-table-item.c @@ -1804,7 +1804,7 @@ e_table_item_print_page (EPrintable *ep, yd--; for (row = rows_printed; row < rows; row++){ - gdouble xd = 0, row_height; + gdouble xd = 1, row_height; row_height = eti_printed_row_height(item, widths, context, row); if (quantize) { @@ -1894,6 +1894,7 @@ e_table_item_height (EPrintable *ep, GnomePrintContext *context, gdouble width, gdouble max_height, + gboolean quantize, ETableItemPrintContext *itemcontext) { ETableItem *item = itemcontext->item; @@ -1914,8 +1915,14 @@ e_table_item_height (EPrintable *ep, gdouble row_height; row_height = eti_printed_row_height(item, widths, context, row); - if (max_height != -1 && yd + row_height + 1 > max_height && row != rows_printed) { - break; + if (quantize) { + if (max_height != -1 && yd + row_height + 1 > max_height && row != rows_printed) { + break; + } + } else { + if (max_height != -1 && yd > max_height) { + break; + } } yd += row_height; @@ -1924,11 +1931,64 @@ e_table_item_height (EPrintable *ep, } g_free (widths); + + if (max_height != -1 && (!quantize) && yd > max_height) + yd = max_height; gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height"); return yd; } +static gboolean +e_table_item_will_fit (EPrintable *ep, + GnomePrintContext *context, + gdouble width, + gdouble max_height, + gboolean quantize, + ETableItemPrintContext *itemcontext) +{ + ETableItem *item = itemcontext->item; + const int rows = item->rows; + int rows_printed = itemcontext->rows_printed; + gdouble *widths; + int row; + gdouble yd = 0; + gboolean ret_val = TRUE; + + widths = e_table_item_calculate_print_widths (itemcontext->item->header, width); + + /* + * Draw cells + */ + yd++; + + for (row = rows_printed; row < rows; row++){ + gdouble row_height; + + row_height = eti_printed_row_height(item, widths, context, row); + if (quantize) { + if (max_height != -1 && yd + row_height + 1 > max_height && row != rows_printed) { + ret_val = FALSE; + break; + } + } else { + if (max_height != -1 && yd > max_height) { + ret_val = FALSE; + break; + } + } + + yd += row_height; + + yd++; + } + + g_free (widths); + + gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit"); + return ret_val; +} + static void e_table_item_printable_destroy (GtkObject *object, ETableItemPrintContext *itemcontext) @@ -1965,6 +2025,10 @@ e_table_item_get_printable (ETableItem *item) GTK_SIGNAL_FUNC(e_table_item_height), itemcontext); gtk_signal_connect (GTK_OBJECT(printable), + "will_fit", + GTK_SIGNAL_FUNC(e_table_item_will_fit), + itemcontext); + gtk_signal_connect (GTK_OBJECT(printable), "destroy", GTK_SIGNAL_FUNC(e_table_item_printable_destroy), itemcontext); diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 9495ce86a9..7fe9cc1815 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -1167,9 +1167,23 @@ ect_print (ECellView *ecell_view, GnomePrintContext *context, } else { string = e_table_model_value_at (ecell_view->e_table_model, model_col, row); } - gnome_print_moveto(context, 0, (height - gnome_font_get_ascender(font) + gnome_font_get_descender(font)) / 2); + gnome_print_gsave(context); + if (gnome_print_moveto(context, 2, 2) == -1) + /* FIXME */; + if (gnome_print_lineto(context, width - 2, 2) == -1) + /* FIXME */; + if (gnome_print_lineto(context, width - 2, height - 2) == -1) + /* FIXME */; + if (gnome_print_lineto(context, 2, height - 2) == -1) + /* FIXME */; + if (gnome_print_lineto(context, 2, 2) == -1) + /* FIXME */; + if (gnome_print_clip(context) == -1) + /* FIXME */; + gnome_print_moveto(context, 2, (height - gnome_font_get_ascender(font) + gnome_font_get_descender(font)) / 2); gnome_print_setfont(context, font); gnome_print_show(context, string); + gnome_print_grestore(context); if (ect->filter) { g_free(string); } @@ -1180,7 +1194,7 @@ ect_print_height (ECellView *ecell_view, GnomePrintContext *context, int model_col, int view_col, int row, double width) { - return 12; + return 16; } /* diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 25c7fb2132..8e48f447a8 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -48,6 +48,10 @@ typedef struct { gint count; } ETableGroupContainerChildNode; +static EPrintable * +etgc_get_printable (ETableGroup *etg); + + static void e_table_group_container_child_node_free (ETableGroupContainer *etgc, ETableGroupContainerChildNode *child_node) @@ -670,6 +674,7 @@ etgc_class_init (GtkObjectClass *object_class) e_group_class->get_selected_view_row = etgc_get_selected_view_row; e_group_class->unfocus = etgc_unfocus; e_group_class->get_focus_column = etgc_get_focus_column; + e_group_class->get_printable = etgc_get_printable; gtk_object_add_arg_type ("ETableGroupContainer::drawgrid", GTK_TYPE_BOOL, GTK_ARG_WRITABLE, ARG_TABLE_DRAW_GRID); @@ -807,3 +812,308 @@ e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, void *clos } } + +typedef struct { + ETableGroupContainer *etgc; + GList *child; + EPrintable *child_printable; +} ETGCPrintContext; + +#if 0 +#define CHECK(x) if((x) == -1) return -1; + +static gint +gp_draw_rect (GnomePrintContext *context, gdouble x, gdouble y, gdouble width, gdouble height, gdouble r, gdouble g, gdouble b) +{ + CHECK(gnome_print_moveto(context, x, y)); + CHECK(gnome_print_lineto(context, x + width, y)); + CHECK(gnome_print_lineto(context, x + width, y - height)); + CHECK(gnome_print_lineto(context, x, y - height)); + CHECK(gnome_print_lineto(context, x, y)); + return gnome_print_fill(context); +} +#endif + +static void +e_table_group_container_print_page (EPrintable *ep, + GnomePrintContext *context, + gdouble width, + gdouble height, + gboolean quantize, + ETGCPrintContext *groupcontext) +{ + gdouble yd = height; + gdouble child_height; + ETableGroupContainerChildNode *child_node; + GList *child; + EPrintable *child_printable; + + child_printable = groupcontext->child_printable; + child = groupcontext->child; + + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + else { + if (!child) { + return; + } else { + child_node = child->data; + child_printable = e_table_group_get_printable(child_node->child); + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + e_printable_reset(child_printable); + } + } + + while (1) { + child_height = e_printable_height(child_printable, context, width - 36, yd, quantize); + + if (gnome_print_gsave(context) == -1) + /* FIXME */; + if (gnome_print_translate(context, 36, yd - child_height) == -1) + /* FIXME */; + + if (gnome_print_moveto(context, 0, 0) == -1) + /* FIXME */; + if (gnome_print_lineto(context, width - 36, 0) == -1) + /* FIXME */; + if (gnome_print_lineto(context, width - 36, child_height) == -1) + /* FIXME */; + if (gnome_print_lineto(context, 0, child_height) == -1) + /* FIXME */; + if (gnome_print_lineto(context, 0, 0) == -1) + /* FIXME */; + if (gnome_print_clip(context) == -1) + /* FIXME */; + + e_printable_print_page(child_printable, context, width - 36, child_height, quantize); + + if (gnome_print_grestore(context) == -1) + /* FIXME */; + + yd -= child_height; + + if (e_printable_data_left(child_printable)) + break; + + child = child->next; + if (!child) { + child_printable = NULL; + break; + } + + child_node = child->data; + if (child_printable) + gtk_object_unref(GTK_OBJECT(child_printable)); + child_printable = e_table_group_get_printable(child_node->child); + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + e_printable_reset(child_printable); + } + + if (groupcontext->child_printable) + gtk_object_unref(GTK_OBJECT(groupcontext->child_printable)); + groupcontext->child_printable = child_printable; + groupcontext->child = child; + +} + +static gboolean +e_table_group_container_data_left (EPrintable *ep, + ETGCPrintContext *groupcontext) +{ + gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "data_left"); + return groupcontext->child != NULL; +} + +static void +e_table_group_container_reset (EPrintable *ep, + ETGCPrintContext *groupcontext) +{ + groupcontext->child = groupcontext->etgc->children; + if (groupcontext->child_printable) + gtk_object_unref(GTK_OBJECT(groupcontext->child_printable)); + groupcontext->child_printable = NULL; +} + +static gdouble +e_table_group_container_height (EPrintable *ep, + GnomePrintContext *context, + gdouble width, + gdouble max_height, + gboolean quantize, + ETGCPrintContext *groupcontext) +{ + gdouble height = 0; + gdouble child_height; + gdouble yd = max_height; + ETableGroupContainerChildNode *child_node; + GList *child; + EPrintable *child_printable; + + child_printable = groupcontext->child_printable; + child = groupcontext->child; + + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + else { + if (!child) { + gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height"); + return 0; + } else { + child_node = child->data; + child_printable = e_table_group_get_printable(child_node->child); + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + e_printable_reset(child_printable); + } + } + + while (1) { + child_height = e_printable_height(child_printable, context, width - 36, yd, quantize); + + height += child_height; + + if (yd != -1) { + if (!e_printable_will_fit(child_printable, context, width - 36, yd, quantize)) { + break; + } + + yd -= child_height; + } + + child = child->next; + if (!child) { + break; + } + + child_node = child->data; + if (child_printable) + gtk_object_unref(GTK_OBJECT(child_printable)); + child_printable = e_table_group_get_printable(child_node->child); + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + e_printable_reset(child_printable); + } + if (child_printable) + gtk_object_unref(GTK_OBJECT(child_printable)); + gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height"); + return height; +} + +static gboolean +e_table_group_container_will_fit (EPrintable *ep, + GnomePrintContext *context, + gdouble width, + gdouble max_height, + gboolean quantize, + ETGCPrintContext *groupcontext) +{ + gboolean will_fit = TRUE; + gdouble child_height; + gdouble yd = max_height; + ETableGroupContainerChildNode *child_node; + GList *child; + EPrintable *child_printable; + + child_printable = groupcontext->child_printable; + child = groupcontext->child; + + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + else { + if (!child) { + gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit"); + return will_fit; + } else { + child_node = child->data; + child_printable = e_table_group_get_printable(child_node->child); + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + e_printable_reset(child_printable); + } + } + + while (1) { + child_height = e_printable_height(child_printable, context, width - 36, yd, quantize); + + if (yd != -1) { + if (!e_printable_will_fit(child_printable, context, width - 36, yd, quantize)) { + will_fit = FALSE; + break; + } + + yd -= child_height; + } + + child = child->next; + if (!child) { + break; + } + + child_node = child->data; + if (child_printable) + gtk_object_unref(GTK_OBJECT(child_printable)); + child_printable = e_table_group_get_printable(child_node->child); + if (child_printable) + gtk_object_ref(GTK_OBJECT(child_printable)); + e_printable_reset(child_printable); + } + + if (child_printable) + gtk_object_unref(GTK_OBJECT(child_printable)); + + gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit"); + return will_fit; +} + +static void +e_table_group_container_printable_destroy (GtkObject *object, + ETGCPrintContext *groupcontext) +{ + gtk_object_unref(GTK_OBJECT(groupcontext->etgc)); + if (groupcontext->child_printable) + gtk_object_ref(GTK_OBJECT(groupcontext->child_printable)); + g_free(groupcontext); +} + +static EPrintable * +etgc_get_printable (ETableGroup *etg) +{ + ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg); + EPrintable *printable = e_printable_new(); + ETGCPrintContext *groupcontext; + + groupcontext = g_new(ETGCPrintContext, 1); + groupcontext->etgc = etgc; + gtk_object_ref(GTK_OBJECT(etgc)); + groupcontext->child = etgc->children; + groupcontext->child_printable = NULL; + + gtk_signal_connect (GTK_OBJECT(printable), + "print_page", + GTK_SIGNAL_FUNC(e_table_group_container_print_page), + groupcontext); + gtk_signal_connect (GTK_OBJECT(printable), + "data_left", + GTK_SIGNAL_FUNC(e_table_group_container_data_left), + groupcontext); + gtk_signal_connect (GTK_OBJECT(printable), + "reset", + GTK_SIGNAL_FUNC(e_table_group_container_reset), + groupcontext); + gtk_signal_connect (GTK_OBJECT(printable), + "height", + GTK_SIGNAL_FUNC(e_table_group_container_height), + groupcontext); + gtk_signal_connect (GTK_OBJECT(printable), + "will_fit", + GTK_SIGNAL_FUNC(e_table_group_container_will_fit), + groupcontext); + gtk_signal_connect (GTK_OBJECT(printable), + "destroy", + GTK_SIGNAL_FUNC(e_table_group_container_printable_destroy), + groupcontext); + + return printable; +} diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 0de4181cdf..5167c794e6 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -1804,7 +1804,7 @@ e_table_item_print_page (EPrintable *ep, yd--; for (row = rows_printed; row < rows; row++){ - gdouble xd = 0, row_height; + gdouble xd = 1, row_height; row_height = eti_printed_row_height(item, widths, context, row); if (quantize) { @@ -1894,6 +1894,7 @@ e_table_item_height (EPrintable *ep, GnomePrintContext *context, gdouble width, gdouble max_height, + gboolean quantize, ETableItemPrintContext *itemcontext) { ETableItem *item = itemcontext->item; @@ -1914,8 +1915,14 @@ e_table_item_height (EPrintable *ep, gdouble row_height; row_height = eti_printed_row_height(item, widths, context, row); - if (max_height != -1 && yd + row_height + 1 > max_height && row != rows_printed) { - break; + if (quantize) { + if (max_height != -1 && yd + row_height + 1 > max_height && row != rows_printed) { + break; + } + } else { + if (max_height != -1 && yd > max_height) { + break; + } } yd += row_height; @@ -1924,11 +1931,64 @@ e_table_item_height (EPrintable *ep, } g_free (widths); + + if (max_height != -1 && (!quantize) && yd > max_height) + yd = max_height; gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height"); return yd; } +static gboolean +e_table_item_will_fit (EPrintable *ep, + GnomePrintContext *context, + gdouble width, + gdouble max_height, + gboolean quantize, + ETableItemPrintContext *itemcontext) +{ + ETableItem *item = itemcontext->item; + const int rows = item->rows; + int rows_printed = itemcontext->rows_printed; + gdouble *widths; + int row; + gdouble yd = 0; + gboolean ret_val = TRUE; + + widths = e_table_item_calculate_print_widths (itemcontext->item->header, width); + + /* + * Draw cells + */ + yd++; + + for (row = rows_printed; row < rows; row++){ + gdouble row_height; + + row_height = eti_printed_row_height(item, widths, context, row); + if (quantize) { + if (max_height != -1 && yd + row_height + 1 > max_height && row != rows_printed) { + ret_val = FALSE; + break; + } + } else { + if (max_height != -1 && yd > max_height) { + ret_val = FALSE; + break; + } + } + + yd += row_height; + + yd++; + } + + g_free (widths); + + gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit"); + return ret_val; +} + static void e_table_item_printable_destroy (GtkObject *object, ETableItemPrintContext *itemcontext) @@ -1965,6 +2025,10 @@ e_table_item_get_printable (ETableItem *item) GTK_SIGNAL_FUNC(e_table_item_height), itemcontext); gtk_signal_connect (GTK_OBJECT(printable), + "will_fit", + GTK_SIGNAL_FUNC(e_table_item_will_fit), + itemcontext); + gtk_signal_connect (GTK_OBJECT(printable), "destroy", GTK_SIGNAL_FUNC(e_table_item_printable_destroy), itemcontext); |