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

Merge from HEAD:

Browse Source 
2004-05-10  Matthias Clasen  <mclasen@redhat.com>

	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)
This commit is contained in:
Matthias Clasen
2004-05-10 15:47:13 +00:00
committed by Matthias Clasen
parent 37976d540d
commit 457e5acb0b
5 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2004-05-10 Matthias Clasen <mclasen@redhat.com>
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 <mclasen@redhat.com>
Merge from HEAD:

8
ChangeLog.pre-2-10
View File

@@ -1,3 +1,11 @@
2004-05-10 Matthias Clasen <mclasen@redhat.com>
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 <mclasen@redhat.com>
Merge from HEAD:

8
ChangeLog.pre-2-6
View File

@@ -1,3 +1,11 @@
2004-05-10 Matthias Clasen <mclasen@redhat.com>
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 <mclasen@redhat.com>
Merge from HEAD:

8
ChangeLog.pre-2-8
View File

@@ -1,3 +1,11 @@
2004-05-10 Matthias Clasen <mclasen@redhat.com>
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 <mclasen@redhat.com>
Merge from HEAD:

13
gtk/gtkcombobox.c
View File

@@ -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,