From 457e5acb0bf772af8bc05203e4f5a4a6d91c6ed5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 10 May 2004 15:47:13 +0000 Subject: [PATCH] Merge from HEAD: 2004-05-10 Matthias Clasen Merge from HEAD: * gtk/gtkcombobox.c (gtk_combo_box_popup) (gtk_combo_box_menu_button_press): Make sure the menu pops up as wide as the combobox. (#59660, Havoc Pennington) --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkcombobox.c | 13 +++++++++++++ 5 files changed, 45 insertions(+) diff --git a/ChangeLog b/ChangeLog index 01b1689ef2..6c095d2c6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-05-10 Matthias Clasen + + Merge from HEAD: + + * gtk/gtkcombobox.c (gtk_combo_box_popup) + (gtk_combo_box_menu_button_press): Make sure the menu pops up + as wide as the combobox. (#59660, Havoc Pennington) + 2004-05-10 Matthias Clasen Merge from HEAD: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 01b1689ef2..6c095d2c6e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2004-05-10 Matthias Clasen + + Merge from HEAD: + + * gtk/gtkcombobox.c (gtk_combo_box_popup) + (gtk_combo_box_menu_button_press): Make sure the menu pops up + as wide as the combobox. (#59660, Havoc Pennington) + 2004-05-10 Matthias Clasen Merge from HEAD: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 01b1689ef2..6c095d2c6e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2004-05-10 Matthias Clasen + + Merge from HEAD: + + * gtk/gtkcombobox.c (gtk_combo_box_popup) + (gtk_combo_box_menu_button_press): Make sure the menu pops up + as wide as the combobox. (#59660, Havoc Pennington) + 2004-05-10 Matthias Clasen Merge from HEAD: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 01b1689ef2..6c095d2c6e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2004-05-10 Matthias Clasen + + Merge from HEAD: + + * gtk/gtkcombobox.c (gtk_combo_box_popup) + (gtk_combo_box_menu_button_press): Make sure the menu pops up + as wide as the combobox. (#59660, Havoc Pennington) + 2004-05-10 Matthias Clasen Merge from HEAD: diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 00c523d3a1..83228bf8e3 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1116,6 +1116,12 @@ gtk_combo_box_popup (GtkComboBox *combo_box) gtk_menu_set_active (GTK_MENU (combo_box->priv->popup_widget), combo_box->priv->active_item); + if (combo_box->priv->wrap_width == 0) + { + width = GTK_WIDGET (combo_box)->allocation.width; + gtk_widget_set_size_request (combo_box->priv->popup_widget, width, -1); + } + gtk_menu_popup (GTK_MENU (combo_box->priv->popup_widget), NULL, NULL, gtk_combo_box_menu_position, combo_box, @@ -1867,6 +1873,7 @@ gtk_combo_box_menu_button_press (GtkWidget *widget, gpointer user_data) { GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); + gint width; if (! GTK_IS_MENU (combo_box->priv->popup_widget)) return FALSE; @@ -1878,6 +1885,12 @@ gtk_combo_box_menu_button_press (GtkWidget *widget, gtk_menu_set_active (GTK_MENU (combo_box->priv->popup_widget), combo_box->priv->active_item); + if (combo_box->priv->wrap_width == 0) + { + width = GTK_WIDGET (combo_box)->allocation.width; + gtk_widget_set_size_request (combo_box->priv->popup_widget, width, -1); + } + gtk_menu_popup (GTK_MENU (combo_box->priv->popup_widget), NULL, NULL, gtk_combo_box_menu_position, combo_box,