diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-03-07 19:10:51 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-03-07 19:10:51 +0000 |
| commit | 5822ba76d0edadec80921cf698e215e25c2cc532 (patch) | |
| tree | cfce597aa5a8a1a2431df449278b3c82fe65be6a /gtk/deprecated | |
| parent | a6ad8ebe0cea99d9e8bc37085ad03c950a36be06 (diff) | |
| parent | 55faea104694599298a6ca1b9f2e7a1b46bad45a (diff) | |
| download | gtk+-5822ba76d0edadec80921cf698e215e25c2cc532.tar.gz | |
Merge branch 'unbreak-combobox' into 'main'
combobox: Avoid extra queue_resize()
Closes #5644
See merge request GNOME/gtk!5608
Diffstat (limited to 'gtk/deprecated')
| -rw-r--r-- | gtk/deprecated/gtkcombobox.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/gtk/deprecated/gtkcombobox.c b/gtk/deprecated/gtkcombobox.c index 618f0780b7..1e76b38f41 100644 --- a/gtk/deprecated/gtkcombobox.c +++ b/gtk/deprecated/gtkcombobox.c @@ -366,7 +366,6 @@ gtk_combo_box_size_allocate (GtkWidget *widget, { GtkComboBox *combo_box = GTK_COMBO_BOX (widget); GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); - int menu_width; gtk_widget_size_allocate (priv->box, &(GtkAllocation) { @@ -374,17 +373,8 @@ gtk_combo_box_size_allocate (GtkWidget *widget, width, height }, baseline); - gtk_widget_set_size_request (priv->popup_widget, -1, -1); - - if (priv->popup_fixed_width) - gtk_widget_measure (priv->popup_widget, GTK_ORIENTATION_HORIZONTAL, -1, - &menu_width, NULL, NULL, NULL); - else - gtk_widget_measure (priv->popup_widget, GTK_ORIENTATION_HORIZONTAL, -1, - NULL, &menu_width, NULL, NULL); - - gtk_widget_set_size_request (priv->popup_widget, - MAX (width, menu_width), -1); + gtk_widget_set_size_request (priv->popup_widget, width, -1); + gtk_widget_queue_resize (priv->popup_widget); gtk_popover_present (GTK_POPOVER (priv->popup_widget)); } |