callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

printunixdialog: Connect to draw vfunc

Browse Source
This commit is contained in:
Benjamin Otte
2010-09-08 21:35:03 +02:00
parent d207fd05e5
commit 3f10e45ea1
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkprintunixdialog.c
View File

@ -2576,13 +2576,11 @@ dialog_get_number_up_layout (GtkPrintUnixDialog *dialog)
static gboolean static gboolean
draw_page_cb (GtkWidget *widget, draw_page_cb (GtkWidget *widget,
GdkEventExpose *event, cairo_t *cr,
GtkPrintUnixDialog *dialog) GtkPrintUnixDialog *dialog)
{ {
GtkPrintUnixDialogPrivate *priv = dialog->priv; GtkPrintUnixDialogPrivate *priv = dialog->priv;
GtkAllocation allocation;
GtkStyle *style; GtkStyle *style;
cairo_t *cr;
gdouble ratio; gdouble ratio;
gint w, h, tmp, shadow_offset; gint w, h, tmp, shadow_offset;
gint pages_x, pages_y, i, x, y, layout_w, layout_h; gint pages_x, pages_y, i, x, y, layout_w, layout_h;
@ -2596,6 +2594,7 @@ draw_page_cb (GtkWidget *widget,
GtkNumberUpLayout number_up_layout; GtkNumberUpLayout number_up_layout;
gint start_x, end_x, start_y, end_y; gint start_x, end_x, start_y, end_y;
gint dx, dy; gint dx, dy;
gint width, height;
gboolean horizontal; gboolean horizontal;
GtkPageSetup *page_setup; GtkPageSetup *page_setup;
gdouble paper_width, paper_height; gdouble paper_width, paper_height;
@ -2609,8 +2608,8 @@ draw_page_cb (GtkWidget *widget,
(orientation == GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE); (orientation == GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE);
number_up_layout = dialog_get_number_up_layout (dialog); number_up_layout = dialog_get_number_up_layout (dialog);
width = gtk_widget_get_allocated_width (widget);
cr = gdk_cairo_create (gtk_widget_get_window (widget)); height = gtk_widget_get_allocated_height (widget);
cairo_save (cr); cairo_save (cr);
@ -2692,9 +2691,8 @@ draw_page_cb (GtkWidget *widget,
style = gtk_widget_get_style (widget); style = gtk_widget_get_style (widget);
gtk_widget_get_allocation (widget, &allocation); pos_x = (width - w) / 2;
pos_x = allocation.x + (allocation.width - w) / 2; pos_y = (height - h) / 2 - 10;
pos_y = allocation.y + (allocation.height - h) / 2 - 10;
cairo_translate (cr, pos_x, pos_y); cairo_translate (cr, pos_x, pos_y);
shadow_offset = 3; shadow_offset = 3;
@ -2904,13 +2902,12 @@ draw_page_cb (GtkWidget *widget,
ltr = gtk_widget_get_direction (GTK_WIDGET (dialog)) == GTK_TEXT_DIR_LTR; ltr = gtk_widget_get_direction (GTK_WIDGET (dialog)) == GTK_TEXT_DIR_LTR;
gtk_widget_get_allocation (widget, &allocation);
if (ltr) if (ltr)
cairo_translate (cr, pos_x - layout_w / PANGO_SCALE - 2 * RULER_DISTANCE, cairo_translate (cr, pos_x - layout_w / PANGO_SCALE - 2 * RULER_DISTANCE,
allocation.y + (allocation.height - layout_h / PANGO_SCALE) / 2); (height - layout_h / PANGO_SCALE) / 2);
else else
cairo_translate (cr, pos_x + w + shadow_offset + 2 * RULER_DISTANCE, cairo_translate (cr, pos_x + w + shadow_offset + 2 * RULER_DISTANCE,
allocation.y + (allocation.height - layout_h / PANGO_SCALE) / 2); (height - layout_h / PANGO_SCALE) / 2);
pango_cairo_show_layout (cr, layout); pango_cairo_show_layout (cr, layout);
@ -2926,7 +2923,7 @@ draw_page_cb (GtkWidget *widget,
g_free (text); g_free (text);
pango_layout_get_size (layout, &layout_w, &layout_h); pango_layout_get_size (layout, &layout_w, &layout_h);
cairo_translate (cr, allocation.x + (allocation.width - layout_w / PANGO_SCALE) / 2, cairo_translate (cr, (width - layout_w / PANGO_SCALE) / 2,
pos_y + h + shadow_offset + 2 * RULER_DISTANCE); pos_y + h + shadow_offset + 2 * RULER_DISTANCE);
pango_cairo_show_layout (cr, layout); pango_cairo_show_layout (cr, layout);
@ -2979,8 +2976,6 @@ draw_page_cb (GtkWidget *widget,
cairo_stroke (cr); cairo_stroke (cr);
} }
cairo_destroy (cr);
return TRUE; return TRUE;
} }
@ -3515,7 +3510,7 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
gtk_widget_set_has_window (draw, FALSE); gtk_widget_set_has_window (draw, FALSE);
priv->page_layout_preview = draw; priv->page_layout_preview = draw;
gtk_widget_set_size_request (draw, 350, 200); gtk_widget_set_size_request (draw, 350, 200);
g_signal_connect (draw, "expose-event", G_CALLBACK (draw_page_cb), dialog); g_signal_connect (draw, "draw", G_CALLBACK (draw_page_cb), dialog);
gtk_widget_show (draw); gtk_widget_show (draw);
gtk_box_pack_start (GTK_BOX (hbox2), draw, TRUE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox2), draw, TRUE, FALSE, 0);