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

Make the size of the arrow depend only on the font size, not on the child

Browse Source 
2004-11-22  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenuitem.c (gtk_menu_item_paint): Make the size of
	the arrow depend only on the font size, not on the child
	allocation.  (#131345, Morten Welinder)
This commit is contained in:
Matthias Clasen 2004-11-22 17:07:41 +00:00 committed by Matthias Clasen
parent c77a880be9
commit 5ffa85e1f0
5 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2004-11-22 Matthias Clasen <mclasen@redhat.com> 2004-11-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenuitem.c (gtk_menu_item_paint): Make the size of
the arrow depend only on the font size, not on the child
allocation. (#131345, Morten Welinder)
* configure.in: Require Pango 1.7.0 for PangoRenderer (#159061, * configure.in: Require Pango 1.7.0 for PangoRenderer (#159061,
Crispin Flowerday) Crispin Flowerday)

4
ChangeLog.pre-2-10
View File

@ -1,5 +1,9 @@
2004-11-22 Matthias Clasen <mclasen@redhat.com> 2004-11-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenuitem.c (gtk_menu_item_paint): Make the size of
the arrow depend only on the font size, not on the child
allocation. (#131345, Morten Welinder)
* configure.in: Require Pango 1.7.0 for PangoRenderer (#159061, * configure.in: Require Pango 1.7.0 for PangoRenderer (#159061,
Crispin Flowerday) Crispin Flowerday)

4
ChangeLog.pre-2-6
View File

@ -1,5 +1,9 @@
2004-11-22 Matthias Clasen <mclasen@redhat.com> 2004-11-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenuitem.c (gtk_menu_item_paint): Make the size of
the arrow depend only on the font size, not on the child
allocation. (#131345, Morten Welinder)
* configure.in: Require Pango 1.7.0 for PangoRenderer (#159061, * configure.in: Require Pango 1.7.0 for PangoRenderer (#159061,
Crispin Flowerday) Crispin Flowerday)

4
ChangeLog.pre-2-8
View File

@ -1,5 +1,9 @@
2004-11-22 Matthias Clasen <mclasen@redhat.com> 2004-11-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenuitem.c (gtk_menu_item_paint): Make the size of
the arrow depend only on the font size, not on the child
allocation. (#131345, Morten Welinder)
* configure.in: Require Pango 1.7.0 for PangoRenderer (#159061, * configure.in: Require Pango 1.7.0 for PangoRenderer (#159061,
Crispin Flowerday) Crispin Flowerday)

17
gtk/gtkmenuitem.c
View File

@ -725,6 +725,10 @@ gtk_menu_item_paint (GtkWidget *widget,
guint horizontal_padding; guint horizontal_padding;
GtkTextDirection direction; GtkTextDirection direction;
GtkArrowType arrow_type; GtkArrowType arrow_type;
PangoContext *context;
PangoFontMetrics *metrics;
gint ascent, descent;
PangoLayout *layout;
direction = gtk_widget_get_direction (widget); direction = gtk_widget_get_direction (widget);
@ -732,10 +736,17 @@ gtk_menu_item_paint (GtkWidget *widget,
"horizontal_padding", &horizontal_padding, "horizontal_padding", &horizontal_padding,
NULL); NULL);
gtk_widget_get_child_requisition (GTK_BIN (menu_item)->child, context = gtk_widget_get_pango_context (GTK_BIN (menu_item)->child);
&child_requisition); metrics = pango_context_get_metrics (context,
GTK_WIDGET (GTK_BIN (menu_item)->child)->style->font_desc,
pango_context_get_language (context));
ascent = pango_font_metrics_get_ascent (metrics);
descent = pango_font_metrics_get_descent (metrics);
pango_font_metrics_unref (metrics);
arrow_size = PANGO_PIXELS (ascent + descent) - 2 * widget->style->ythickness;
arrow_size = child_requisition.height - 2 * widget->style->ythickness;
arrow_extent = arrow_size * 0.8; arrow_extent = arrow_size * 0.8;
shadow_type = GTK_SHADOW_OUT; shadow_type = GTK_SHADOW_OUT;