gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-10-29 03:34:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't hardcode font sizes. Fixes bug #123478

Browse source 
2004-03-01  Alexander Larsson  <alexl@redhat.com>

	* src/nautilus-sidebar-title.c:
	Don't hardcode font sizes. Fixes bug #123478
This commit is contained in:
Alexander Larsson 2004-03-01 10:32:57 +00:00 committed by Alexander Larsson
parent 85fb908fd0
commit 74d763e3df
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-03-01 Alexander Larsson <alexl@redhat.com>
* src/nautilus-sidebar-title.c:
Don't hardcode font sizes. Fixes bug #123478
2004-02-27 Dave Camp <dave@ximian.com>
* src/file-manager/fm-list-model.c: (fm_list_model_get_value):

17
src/nautilus-sidebar-title.c
View file

@ -64,7 +64,6 @@
#define MORE_INFO_FONT_SIZE 12
#define MIN_TITLE_FONT_SIZE 12
#define MAX_TITLE_FONT_SIZE 18
#define TITLE_PADDING 4
static void nautilus_sidebar_title_class_init (NautilusSidebarTitleClass *klass);
@ -132,7 +131,9 @@ style_set (GtkWidget *widget,
/* Update the fixed-size "more info" font */
style = gtk_widget_get_style (widget);
font_desc = pango_font_description_copy (style->font_desc);
pango_font_description_set_size (font_desc, MORE_INFO_FONT_SIZE * PANGO_SCALE);
if (pango_font_description_get_size (font_desc) < MORE_INFO_FONT_SIZE * PANGO_SCALE) {
pango_font_description_set_size (font_desc, MORE_INFO_FONT_SIZE * PANGO_SCALE);
}
gtk_widget_modify_font (sidebar_title->details->more_info_label,
font_desc);
@ -399,6 +400,7 @@ update_title_font (NautilusSidebarTitle *sidebar_title)
int available_width;
PangoFontDescription *title_font;
int largest_fitting_font_size;
int max_style_font_size;
GtkStyle *style;
/* Make sure theres work to do */
@ -415,14 +417,21 @@ update_title_font (NautilusSidebarTitle *sidebar_title)
style = gtk_widget_get_style (GTK_WIDGET (sidebar_title));
title_font = pango_font_description_copy (style->font_desc);
max_style_font_size = pango_font_description_get_size (title_font) * 1.8 / PANGO_SCALE;
if (max_style_font_size < MIN_TITLE_FONT_SIZE) {
max_style_font_size = MIN_TITLE_FONT_SIZE + 1;
}
largest_fitting_font_size = eel_pango_font_description_get_largest_fitting_font_size (
title_font,
gtk_widget_get_pango_context (sidebar_title->details->title_label),
sidebar_title->details->title_text,
available_width,
MIN_TITLE_FONT_SIZE,
MAX_TITLE_FONT_SIZE);
pango_font_description_set_size (title_font, largest_fitting_font_size * PANGO_SCALE);
max_style_font_size);
pango_font_description_set_size (title_font, largest_fitting_font_size * PANGO_SCALE);
pango_font_description_set_weight (title_font, PANGO_WEIGHT_BOLD);
gtk_widget_modify_font (sidebar_title->details->title_label,