diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gtk/gtkcombobox.c | 3 | ||||
| -rw-r--r-- | gtk/gtkoptionmenu.c | 4 |
3 files changed, 16 insertions, 1 deletions
@@ -1,4 +1,12 @@ -2008-06-10 Christian Persch <chpe@gnome.org> +2008-06-10 Matthias Clasen <mclasen@redhat.com> + + Bug 536765 – GtkComboBox should set COMBO type hint for its menu + + * gtk/gtkoptionmenu.c: + * gtk/gtkcombobox.c: Set the window type hint on popups. + Patch by Danny Baumann + +2008-06-10 Matthias Clasen <mclasen@redhat.com> * gtk/gtkfilesystem.c (get_icon_for_special_directory): (gtk_file_system_volume_render_icon): Add standard icon names, diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 3db35f2431..8d5c12e152 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1575,6 +1575,9 @@ gtk_combo_box_menu_position (GtkMenu *menu, gtk_combo_box_menu_position_over (menu, x, y, push_in, user_data); } + + gtk_window_set_type_hint (GTK_MENU (priv->popup_widget)->toplevel, + GDK_WINDOW_TYPE_HINT_COMBO); } static void diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index 272017bf61..d36816c265 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -894,6 +894,10 @@ gtk_option_menu_position (GtkMenu *menu, active = gtk_menu_get_active (GTK_MENU (option_menu->menu)); gdk_window_get_origin (widget->window, &menu_xpos, &menu_ypos); + /* set combo box type hint for menu popup */ + gtk_window_set_type_hint (GTK_MENU (option_menu->menu)->toplevel, + GDK_WINDOW_TYPE_HINT_COMBO); + menu_xpos += widget->allocation.x; menu_ypos += widget->allocation.y + widget->allocation.height / 2 - 2; |