Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged from HEAD:

Browse Source 
2004-05-11  Michael Natterer  <mitch@gimp.org>

	Merged from HEAD:

	* gtk/gtkcombobox.c (gtk_combo_box_popup)
	(gtk_combo_box_menu_button_press): don't allocate the popup
	smaller than the combobox. Fixes bug #59660.
This commit is contained in:
Michael Natterer
2004-05-11 19:16:38 +00:00
committed by Michael Natterer
parent 79648eb953
commit fccbe77810
5 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2004-05-11 Michael Natterer <mitch@gimp.org>
Merged from HEAD:
* gtk/gtkcombobox.c (gtk_combo_box_popup)
(gtk_combo_box_menu_button_press): don't allocate the popup
smaller than the combobox. Fixes bug #59660.
2004-05-11 Matthias Clasen <mclasen@redhat.com>
Merged from HEAD:

8
ChangeLog.pre-2-10
View File

@@ -1,3 +1,11 @@
2004-05-11 Michael Natterer <mitch@gimp.org>
Merged from HEAD:
* gtk/gtkcombobox.c (gtk_combo_box_popup)
(gtk_combo_box_menu_button_press): don't allocate the popup
smaller than the combobox. Fixes bug #59660.
2004-05-11 Matthias Clasen <mclasen@redhat.com>
Merged from HEAD:

8
ChangeLog.pre-2-6
View File

@@ -1,3 +1,11 @@
2004-05-11 Michael Natterer <mitch@gimp.org>
Merged from HEAD:
* gtk/gtkcombobox.c (gtk_combo_box_popup)
(gtk_combo_box_menu_button_press): don't allocate the popup
smaller than the combobox. Fixes bug #59660.
2004-05-11 Matthias Clasen <mclasen@redhat.com>
Merged from HEAD:

8
ChangeLog.pre-2-8
View File

@@ -1,3 +1,11 @@
2004-05-11 Michael Natterer <mitch@gimp.org>
Merged from HEAD:
* gtk/gtkcombobox.c (gtk_combo_box_popup)
(gtk_combo_box_menu_button_press): don't allocate the popup
smaller than the combobox. Fixes bug #59660.
2004-05-11 Matthias Clasen <mclasen@redhat.com>
Merged from HEAD:

16
gtk/gtkcombobox.c
View File

@@ -1137,8 +1137,13 @@ gtk_combo_box_popup (GtkComboBox *combo_box)
if (combo_box->priv->wrap_width == 0)
{
GtkRequisition requisition;
width = GTK_WIDGET (combo_box)->allocation.width;
gtk_widget_set_size_request (combo_box->priv->popup_widget, width, -1);
gtk_widget_size_request (combo_box->priv->popup_widget, &requisition);
gtk_widget_set_size_request (combo_box->priv->popup_widget,
MAX (width, requisition.width), -1);
}
gtk_menu_popup (GTK_MENU (combo_box->priv->popup_widget),
@@ -1892,7 +1897,6 @@ 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;
@@ -1906,8 +1910,14 @@ gtk_combo_box_menu_button_press (GtkWidget *widget,
if (combo_box->priv->wrap_width == 0)
{
GtkRequisition requisition;
gint width;
width = GTK_WIDGET (combo_box)->allocation.width;
gtk_widget_set_size_request (combo_box->priv->popup_widget, width, -1);
gtk_widget_size_request (combo_box->priv->popup_widget, &requisition);
gtk_widget_set_size_request (combo_box->priv->popup_widget,
MAX (width, requisition.width), -1);
}
gtk_menu_popup (GTK_MENU (combo_box->priv->popup_widget),