AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

printing: Return correct width and height of page setup

Browse Source 
Use correct margins when computing width and height returned by
gtk_page_setup_get_page_width() and
gtk_page_setup_get_page_height().

https://bugzilla.gnome.org/show_bug.cgi?id=671895
This commit is contained in:
Marek Kasik 2014-12-18 16:25:50 +01:00
parent 307ce2f9bd
commit 9ac9769f36
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkpagesetup.c
View File

@ -485,10 +485,14 @@ gtk_page_setup_get_page_width (GtkPageSetup *setup,
GtkUnit unit) GtkUnit unit)
{ {
gdouble width; gdouble width;
width = gtk_page_setup_get_paper_width (setup, GTK_UNIT_MM); width = gtk_page_setup_get_paper_width (setup, GTK_UNIT_MM);
width -= setup->left_margin + setup->right_margin; if (setup->orientation == GTK_PAGE_ORIENTATION_PORTRAIT ||
setup->orientation == GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT)
width -= setup->left_margin + setup->right_margin;
else
width -= setup->top_margin + setup->bottom_margin;
return _gtk_print_convert_from_mm (width, unit); return _gtk_print_convert_from_mm (width, unit);
} }
@ -512,10 +516,14 @@ gtk_page_setup_get_page_height (GtkPageSetup *setup,
GtkUnit unit) GtkUnit unit)
{ {
gdouble height; gdouble height;
height = gtk_page_setup_get_paper_height (setup, GTK_UNIT_MM); height = gtk_page_setup_get_paper_height (setup, GTK_UNIT_MM);
height -= setup->top_margin + setup->bottom_margin; if (setup->orientation == GTK_PAGE_ORIENTATION_PORTRAIT ||
setup->orientation == GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT)
height -= setup->top_margin + setup->bottom_margin;
else
height -= setup->left_margin + setup->right_margin;
return _gtk_print_convert_from_mm (height, unit); return _gtk_print_convert_from_mm (height, unit);
} }