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

Forgotten part of the lpi change

Browse Source
This commit is contained in:
Matthias Clasen
2009-08-30 11:10:47 -04:00
parent f117777c20
commit 13147323d7
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkprintsettings.c
View File

@ -1185,7 +1185,7 @@ gtk_print_settings_set_number_up (GtkPrintSettings *settings,
gint
gtk_print_settings_get_resolution (GtkPrintSettings *settings)
{
return gtk_print_settings_get_int (settings, GTK_PRINT_SETTINGS_RESOLUTION);
return gtk_print_settings_get_int_with_default (settings, GTK_PRINT_SETTINGS_RESOLUTION, 300);
}
/**
@ -1224,7 +1224,7 @@ gtk_print_settings_set_resolution (GtkPrintSettings *settings,
gint
gtk_print_settings_get_resolution_x (GtkPrintSettings *settings)
{
return gtk_print_settings_get_int (settings, GTK_PRINT_SETTINGS_RESOLUTION_X);
return gtk_print_settings_get_int_with_default (settings, GTK_PRINT_SETTINGS_RESOLUTION_X, 300);
}
/**
@ -1240,7 +1240,7 @@ gtk_print_settings_get_resolution_x (GtkPrintSettings *settings)
gint
gtk_print_settings_get_resolution_y (GtkPrintSettings *settings)
{
return gtk_print_settings_get_int (settings, GTK_PRINT_SETTINGS_RESOLUTION_Y);
return gtk_print_settings_get_int_with_default (settings, GTK_PRINT_SETTINGS_RESOLUTION_Y, 300);
}
/**
@ -1281,7 +1281,7 @@ gtk_print_settings_set_resolution_xy (GtkPrintSettings *settings,
gdouble
gtk_print_settings_get_printer_lpi (GtkPrintSettings *settings)
{
return gtk_print_settings_get_double (settings, GTK_PRINT_SETTINGS_PRINTER_LPI);
return gtk_print_settings_get_double_with_default (settings, GTK_PRINT_SETTINGS_PRINTER_LPI, 150.0);
}
/**

21
modules/printbackends/cups/gtkprintbackendcups.c
View File

@ -361,16 +361,14 @@ cups_printer_create_cairo_surface (GtkPrinter *printer,
if (sscanf (ppd_attr_res->value, "%dx%ddpi", &res_x, &res_y) == 2)
{
if (res_x != 0 && res_y != 0)
if (res_x > 0 && res_y > 0)
gtk_print_settings_set_resolution_xy (settings, res_x, res_y);
}
else if (sscanf (ppd_attr_res->value, "%ddpi", &res) == 1)
{
if (res != 0)
if (res > 0)
gtk_print_settings_set_resolution (settings, res);
}
else
gtk_print_settings_set_resolution (settings, 300);
}
}
@ -390,17 +388,10 @@ cups_printer_create_cairo_surface (GtkPrinter *printer,
ppd_attr_screen_freq = ppdFindAttr (ppd_file, "ScreenFreq", NULL);
if (ppd_attr_res_screen_freq != NULL)
if (ppd_attr_res_screen_freq != NULL && atof (ppd_attr_res_screen_freq->value) > 0.0)
gtk_print_settings_set_printer_lpi (settings, atof (ppd_attr_res_screen_freq->value));
else if (ppd_attr_screen_freq != NULL)
else if (ppd_attr_screen_freq != NULL && atof (ppd_attr_screen_freq->value) > 0.0)
gtk_print_settings_set_printer_lpi (settings, atof (ppd_attr_screen_freq->value));
else
gtk_print_settings_set_printer_lpi (settings, 150.0);
}
else
{
gtk_print_settings_set_resolution (settings, 300);
gtk_print_settings_set_printer_lpi (settings, 150.0);
}
if (level == 2)
@ -3781,12 +3772,12 @@ foreach_option_get_settings (GtkPrinterOption *option,
if (sscanf (value, "%dx%ddpi", &res_x, &res_y) == 2)
{
if (res_x != 0 && res_y != 0)
if (res_x > 0 && res_y > 0)
gtk_print_settings_set_resolution_xy (settings, res_x, res_y);
}
else if (sscanf (value, "%ddpi", &res) == 1)
{
if (res != 0)
if (res > 0)
gtk_print_settings_set_resolution (settings, res);
}