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

Remove max_detail_height field from GtkCalendarPrivate. (#339540)

Browse Source 
* gtk/gtkcalendar.c: Drop max_detail_height field, and use
a local variable instead in gtk_calendar_size_request.

svn path=/trunk/; revision=19286
This commit is contained in:
Mathias Hasselmann 2007-12-28 22:11:35 +00:00
parent f02eb139a0
commit 5155cff8d1
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-12-28 Mathias Hasselmann <mathias@openismus.com>
Remove max_detail_height field from GtkCalendarPrivate. (#339540)
* gtk/gtkcalendar.c: Drop max_detail_height field, and use
a local variable instead in gtk_calendar_size_request.
2007-12-28 Matthias Clasen <mclasen@redhat.com> 2007-12-28 Matthias Clasen <mclasen@redhat.com>
* tests/defaultvaluetest.c: Add enough exclusions to make the * tests/defaultvaluetest.c: Add enough exclusions to make the

11
gtk/gtkcalendar.c
View File

@ -257,7 +257,6 @@ struct _GtkCalendarPrivate
guint arrow_width; guint arrow_width;
guint max_month_width; guint max_month_width;
guint max_year_width; guint max_year_width;
guint max_detail_height;
guint day_width; guint day_width;
guint week_width; guint week_width;
@ -1767,6 +1766,7 @@ gtk_calendar_size_request (GtkWidget *widget,
gint max_header_height = 0; gint max_header_height = 0;
gint focus_width; gint focus_width;
gint focus_padding; gint focus_padding;
gint max_detail_height;
gtk_widget_style_get (GTK_WIDGET (widget), gtk_widget_style_get (GTK_WIDGET (widget),
"focus-line-width", &focus_width, "focus-line-width", &focus_width,
@ -1874,7 +1874,7 @@ gtk_calendar_size_request (GtkWidget *widget,
/* Calculate detail extents. Do this as late as possible since /* Calculate detail extents. Do this as late as possible since
* pango_layout_set_markup is called which alters font settings. */ * pango_layout_set_markup is called which alters font settings. */
priv->max_detail_height = 0; max_detail_height = 0;
if (priv->detail_func && (calendar->display_flags & GTK_CALENDAR_SHOW_DETAILS)) if (priv->detail_func && (calendar->display_flags & GTK_CALENDAR_SHOW_DETAILS))
{ {
@ -1904,11 +1904,10 @@ gtk_calendar_size_request (GtkWidget *widget,
pango_layout_set_markup (layout, markup, -1); pango_layout_set_markup (layout, markup, -1);
pango_layout_get_pixel_extents (layout, NULL, &logical_rect); pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
if (priv->detail_width_chars) if (priv->detail_width_chars)
priv->min_day_width = MAX (priv->min_day_width, logical_rect.width); priv->min_day_width = MAX (priv->min_day_width, logical_rect.width);
if (priv->detail_height_rows) if (priv->detail_height_rows)
priv->max_detail_height = MAX (priv->max_detail_height, logical_rect.height); max_detail_height = MAX (max_detail_height, logical_rect.height);
} }
if (!priv->detail_width_chars || !priv->detail_height_rows) if (!priv->detail_width_chars || !priv->detail_height_rows)
@ -1933,7 +1932,7 @@ gtk_calendar_size_request (GtkWidget *widget,
if (!priv->detail_width_chars) if (!priv->detail_width_chars)
priv->min_day_width = MAX (priv->min_day_width, logical_rect.width); priv->min_day_width = MAX (priv->min_day_width, logical_rect.width);
if (!priv->detail_height_rows) if (!priv->detail_height_rows)
priv->max_detail_height = MAX (priv->max_detail_height, logical_rect.height); max_detail_height = MAX (max_detail_height, logical_rect.height);
g_free (markup); g_free (markup);
} }
@ -1979,7 +1978,7 @@ gtk_calendar_size_request (GtkWidget *widget,
priv->main_h = (CALENDAR_MARGIN + calendar_margin priv->main_h = (CALENDAR_MARGIN + calendar_margin
+ 6 * (priv->max_day_char_ascent + 6 * (priv->max_day_char_ascent
+ priv->max_day_char_descent + priv->max_day_char_descent
+ priv->max_detail_height + max_detail_height
+ 2 * (focus_padding + focus_width)) + 2 * (focus_padding + focus_width))
+ DAY_YSEP * 5); + DAY_YSEP * 5);