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

Merged from gtk-2-10:

Browse Source 
2007-03-15  Federico Mena Quintero  <federico@novell.com>

	Merged from gtk-2-10:

	* gtk/gtkfilechooserdefault.c (find_good_size_from_style):
	PANGO_PIXELS() gives us device units, which are *points* in
	pangocairo's parlance, but we want actual pixels.  So, get the
	screen's resolution to compute the actual number of pixels.
	Fixes bug #418585.

svn path=/trunk/; revision=17530
This commit is contained in:
Federico Mena Quintero 2007-03-16 00:53:09 +00:00 committed by Federico Mena Quintero
parent b55d6e4bc9
commit 244bbfa043
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-03-15 Federico Mena Quintero <federico@novell.com>
Merged from gtk-2-10:
* gtk/gtkfilechooserdefault.c (find_good_size_from_style):
PANGO_PIXELS() gives us device units, which are *points* in
pangocairo's parlance, but we want actual pixels. So, get the
screen's resolution to compute the actual number of pixels.
Fixes bug #418585.
2007-03-15 Emmanuele Bassi <ebassi@gnome.org> 2007-03-15 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentmanager.c (gtk_recent_manager_add_item): Remove * gtk/gtkrecentmanager.c (gtk_recent_manager_add_item): Remove

14
gtk/gtkfilechooserdefault.c
View File

@ -7134,12 +7134,24 @@ find_good_size_from_style (GtkWidget *widget,
gint default_width, default_height; gint default_width, default_height;
int font_size; int font_size;
GtkRequisition req; GtkRequisition req;
GdkScreen *screen;
double resolution;
g_assert (widget->style != NULL); g_assert (widget->style != NULL);
impl = GTK_FILE_CHOOSER_DEFAULT (widget); impl = GTK_FILE_CHOOSER_DEFAULT (widget);
screen = gtk_widget_get_screen (widget);
if (screen)
{
resolution = gdk_screen_get_resolution (screen);
if (resolution < 0.0) /* will be -1 if the resolution is not defined in the GdkScreen */
resolution = 96.0;
}
else
resolution = 96.0; /* wheeee */
font_size = pango_font_description_get_size (widget->style->font_desc); font_size = pango_font_description_get_size (widget->style->font_desc);
font_size = PANGO_PIXELS (font_size); font_size = PANGO_PIXELS (font_size) * resolution / 72.0;
default_width = font_size * NUM_CHARS; default_width = font_size * NUM_CHARS;
default_height = font_size * NUM_LINES; default_height = font_size * NUM_LINES;