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

Fix problem with menu titles being clipped (#75948)

Browse Source 
Thu Apr  4 22:28:08 2002  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkmenuitem.c (gtk_menu_item_paint): Fix problem with menu
	titles being clipped (#75948)
This commit is contained in:
Soeren Sandmann 2002-04-04 20:28:47 +00:00 committed by Søren Sandmann Pedersen
parent abda40ede4
commit 3c52eba0b5
8 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Apr 4 22:28:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenuitem.c (gtk_menu_item_paint): Fix problem with menu
titles being clipped (#75948)
2002-04-04 Tor Lillqvist <tml@iki.fi> 2002-04-04 Tor Lillqvist <tml@iki.fi>
* gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature. * gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature.

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Thu Apr 4 22:28:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenuitem.c (gtk_menu_item_paint): Fix problem with menu
titles being clipped (#75948)
2002-04-04 Tor Lillqvist <tml@iki.fi> 2002-04-04 Tor Lillqvist <tml@iki.fi>
* gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature. * gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature.

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
Thu Apr 4 22:28:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenuitem.c (gtk_menu_item_paint): Fix problem with menu
titles being clipped (#75948)
2002-04-04 Tor Lillqvist <tml@iki.fi> 2002-04-04 Tor Lillqvist <tml@iki.fi>
* gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature. * gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature.

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
Thu Apr 4 22:28:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenuitem.c (gtk_menu_item_paint): Fix problem with menu
titles being clipped (#75948)
2002-04-04 Tor Lillqvist <tml@iki.fi> 2002-04-04 Tor Lillqvist <tml@iki.fi>
* gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature. * gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature.

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Thu Apr 4 22:28:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenuitem.c (gtk_menu_item_paint): Fix problem with menu
titles being clipped (#75948)
2002-04-04 Tor Lillqvist <tml@iki.fi> 2002-04-04 Tor Lillqvist <tml@iki.fi>
* gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature. * gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature.

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Thu Apr 4 22:28:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenuitem.c (gtk_menu_item_paint): Fix problem with menu
titles being clipped (#75948)
2002-04-04 Tor Lillqvist <tml@iki.fi> 2002-04-04 Tor Lillqvist <tml@iki.fi>
* gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature. * gdk/gdkrgb.c: Fix some bugs, and introduce a minor feature.

11
gtk/gtkmenuitem.c
View File

@ -614,9 +614,16 @@ gtk_menu_item_paint (GtkWidget *widget,
if (menu_item->submenu && menu_item->show_submenu_indicator) if (menu_item->submenu && menu_item->show_submenu_indicator)
{ {
GtkRequisition child_requisition;
gint arrow_x, arrow_y; gint arrow_x, arrow_y;
gint arrow_size = height - 2 * widget->style->ythickness; gint arrow_size;
gint arrow_extent = arrow_size / 2; gint arrow_extent;
gtk_widget_get_child_requisition (GTK_BIN (menu_item)->child,
&child_requisition);
arrow_size = child_requisition.height - 2 * widget->style->ythickness;
arrow_extent = arrow_size * 0.6;
shadow_type = GTK_SHADOW_OUT; shadow_type = GTK_SHADOW_OUT;
if (state_type == GTK_STATE_PRELIGHT) if (state_type == GTK_STATE_PRELIGHT)

26
tests/testgtk.c
View File

@ -2487,19 +2487,19 @@ void create_labels (void)
frame = gtk_frame_new ("Internationalized Label"); frame = gtk_frame_new ("Internationalized Label");
label = gtk_label_new (NULL); label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), gtk_label_set_markup (GTK_LABEL (label),
"French (Français) Bonjour, Salut\n" "French (Fran<EFBFBD>Ã<EFBFBD>§ais) Bonjour, Salut\n"
"Korean (한글) 안녕하세요, 안녕하십니까\n" "Korean (<EFBFBD>í•œ<EFBFBD>ê<EFBFBD>¸€) <20>안<E280A2>ë…•<E280A6>하<E280A2>ì„<C3AC>¸<EFBFBD>ìš”, <20>안<E280A2>ë…•<E280A6>하<E280A2>ì‹<C3AC>­<EFBFBD>니<E280B9>ê<EFBFBD>¹Œ\n"
"Russian (Русский) Здравствуйте!\n" "Russian (<EFBFBD>Ð<EFBFBD> <EFBFBD>у<EFBFBD>Ñ<EFBFBD><EFBFBD>Ñ<EFBFBD><EFBFBD>Ð<EFBFBD>º<EFBFBD>Ð<EFBFBD>¸<EFBFBD>Ð<EFBFBD>¹) <20>З<C390>Ð<EFBFBD>´<EFBFBD>Ñ€<C391>Ð<EFBFBD>°<EFBFBD>Ð<EFBFBD>²<EFBFBD>Ñ<EFBFBD><C391>Ñ‚<C391>Ð<EFBFBD>²<EFBFBD>у<C391>Ð<EFBFBD>¹<EFBFBD>Ñ‚<C391>Ð<EFBFBD>µ!\n"
"Chinese (Simplified) <span lang=\"zh-cn\">元气 开发</span>\n" "Chinese (Simplified) <span lang=\"zh-cn\"><EFBFBD>å…ƒ<EFBFBD>æ<EFBFBD>°” <09>å<EFBFBD>¼€<C2BC>å<EFBFBD>‘</span>\n"
"Chinese (Traditional) <span lang=\"zh-tw\">元氣 開發</span>\n" "Chinese (Traditional) <span lang=\"zh-tw\"><EFBFBD>å…ƒ<EFBFBD>æ<EFBFBD>°<EFBFBD>£ <09>é–‹<E28093>ç™<C3A7>¼</span>\n"
"Japanese <span lang=\"ja\">元気 開発</span>"); "Japanese <span lang=\"ja\"><EFBFBD>å…ƒ<EFBFBD>æ<EFBFBD>°— <09>é–‹<E28093>ç™<C3A7>º</span>");
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_container_add (GTK_CONTAINER (frame), label); gtk_container_add (GTK_CONTAINER (frame), label);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
frame = gtk_frame_new ("Bidirection Label"); frame = gtk_frame_new ("Bidirection Label");
label = gtk_label_new ("Arabic السلام عليكم\n" label = gtk_label_new ("Arabic <EFBFBD>Ø<EFBFBD>§<EFBFBD>Ù„<EFBFBD>Ø<EFBFBD>³<EFBFBD>Ù„<EFBFBD>Ø<EFBFBD>§<EFBFBD>Ù… <20>Ø<EFBFBD>¹<EFBFBD>Ù„<C399>ÙŠ<C399>Ùƒ<C399>Ù…\n"
"Hebrew שלום"); "Hebrew <EFBFBD>×<EFBFBD>©<EFBFBD>ל<EFBFBD>ו<EFBFBD>×<EFBFBD>");
gtk_widget_set_direction (label, GTK_TEXT_DIR_RTL); gtk_widget_set_direction (label, GTK_TEXT_DIR_RTL);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
gtk_container_add (GTK_CONTAINER (frame), label); gtk_container_add (GTK_CONTAINER (frame), label);
@ -2535,7 +2535,7 @@ void create_labels (void)
frame = gtk_frame_new ("Underlined label"); frame = gtk_frame_new ("Underlined label");
label = gtk_label_new ("This label is underlined!\n" label = gtk_label_new ("This label is underlined!\n"
"This one is underlined (こんにちは) in quite a funky fashion"); "This one is underlined (<EFBFBD>ã<EFBFBD>“<EFBFBD>ã‚“<EFBFBD>ã<EFBFBD><EFBFBD>«<EFBFBD>ã<EFBFBD><EFBFBD>¡<EFBFBD>ã<EFBFBD><EFBFBD>¯) in quite a funky fashion");
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_pattern (GTK_LABEL (label), "_________________________ _ _________ _ _____ _ __ __ ___ ____ _____"); gtk_label_set_pattern (GTK_LABEL (label), "_________________________ _ _________ _ _____ _ __ __ ___ ____ _____");
gtk_container_add (GTK_CONTAINER (frame), label); gtk_container_add (GTK_CONTAINER (frame), label);
@ -3489,7 +3489,7 @@ static GtkItemFactoryEntry menu_items[] =
{ "/File/_Save", NULL, gtk_ifactory_cb, 0, "<StockItem>", GTK_STOCK_SAVE }, { "/File/_Save", NULL, gtk_ifactory_cb, 0, "<StockItem>", GTK_STOCK_SAVE },
{ "/File/Save _As...", "<control>A", gtk_ifactory_cb, 0, "<StockItem>", GTK_STOCK_SAVE }, { "/File/Save _As...", "<control>A", gtk_ifactory_cb, 0, "<StockItem>", GTK_STOCK_SAVE },
{ "/File/_Dump \"_Accels\"", NULL, dump_accels, 0 }, { "/File/_Dump \"_Accels\"", NULL, dump_accels, 0 },
{ "/File/\\/Test__Escaping/And\\/\n\tWei\\\\rdly", { "/File/\\/Test__Escaping/And\\/\n\tWei\\\\rdly/and more",
NULL, gtk_ifactory_cb, 0 }, NULL, gtk_ifactory_cb, 0 },
{ "/File/sep1", NULL, gtk_ifactory_cb, 0, "<Separator>" }, { "/File/sep1", NULL, gtk_ifactory_cb, 0, "<Separator>" },
{ "/File/_Quit", NULL, gtk_ifactory_cb, 0, "<StockItem>", GTK_STOCK_QUIT }, { "/File/_Quit", NULL, gtk_ifactory_cb, 0, "<StockItem>", GTK_STOCK_QUIT },
@ -3648,9 +3648,9 @@ create_key_lookup (void)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_mnemonic ("Button 2 (_A)"); button = gtk_button_new_with_mnemonic ("Button 2 (_A)");
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_mnemonic ("Button 3 (_ф)"); button = gtk_button_new_with_mnemonic ("Button 3 (_<EFBFBD>Ñ„)");
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_mnemonic ("Button 4 (_Ф)"); button = gtk_button_new_with_mnemonic ("Button 4 (_<EFBFBD>Ð<EFBFBD>¤)");
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_mnemonic ("Button 6 (_b)"); button = gtk_button_new_with_mnemonic ("Button 6 (_b)");
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
@ -4073,7 +4073,7 @@ create_entry (void)
gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE, 0);
entry = gtk_entry_new (); entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (entry), "hello world السلام عليكم"); gtk_entry_set_text (GTK_ENTRY (entry), "hello world <EFBFBD>Ø<EFBFBD>§<EFBFBD>Ù„<EFBFBD>Ø<EFBFBD>³<EFBFBD>Ù„<EFBFBD>Ø<EFBFBD>§<EFBFBD>Ù… <20>Ø<EFBFBD>¹<EFBFBD>Ù„<C399>ÙŠ<C399>Ùƒ<C399>Ù…");
gtk_editable_select_region (GTK_EDITABLE (entry), 0, 5); gtk_editable_select_region (GTK_EDITABLE (entry), 0, 5);
gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);