callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: revert combo-box drop-down changes

Browse Source 
Revert the use of gtk_combo_box_set_wrap_width() to change the
combo-box drop-down style, except for the status-bar unit combo.
See https://gitlab.gnome.org/GNOME/gimp/issues/2828#note_421312 for
the rationale.

This reverts commits 1d984542e9,
68a33ab5bd, and
6dfca83c2a.

(cherry picked from commit 846d242f30)
This commit is contained in:
Ell
2019-03-27 16:50:57 -04:00
parent 9063b937fe
commit f19ebb6269
8 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/display/gimpscalecombobox.c
View File

@ -186,9 +186,6 @@ gimp_scale_combo_box_constructed (GObject *object)
g_signal_connect (entry, "key-press-event",
G_CALLBACK (gimp_scale_combo_box_entry_key_press),
combo_box);
/* See issues #2828 and #2642. */
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (object), 1);
}
static void

3
app/display/gimpstatusbar.c
View File

@ -235,6 +235,9 @@ gimp_statusbar_init (GimpStatusbar *statusbar)
statusbar->unit_combo = gimp_unit_combo_box_new_with_model (store);
g_object_unref (store);
/* see issue #2642 */
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (statusbar->unit_combo), 1);
gtk_widget_set_can_focus (statusbar->unit_combo, FALSE);
g_object_set (statusbar->unit_combo, "focus-on-click", FALSE, NULL);
gtk_box_pack_start (GTK_BOX (hbox), statusbar->unit_combo, FALSE, FALSE, 0);

3
app/widgets/gimpcontainercombobox.c
View File

@ -177,9 +177,6 @@ gimp_container_combo_box_init (GimpContainerComboBox *combo)
combo);
gtk_widget_set_sensitive (GTK_WIDGET (combo), FALSE);
/* See issues #2828 and #2642. */
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (combo), 1);
}
static void

3
app/widgets/gimplanguagecombobox.c
View File

@ -62,9 +62,6 @@ gimp_language_combo_box_init (GimpLanguageComboBox *combo)
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
"text", GIMP_LANGUAGE_STORE_LABEL,
NULL);
/* See issues #2828 and #2642. */
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (combo), 1);
}
/**

3
libgimpwidgets/gimpcolorprofilecombobox.c
View File

@ -151,9 +151,6 @@ gimp_color_profile_combo_box_init (GimpColorProfileComboBox *combo_box)
gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo_box),
gimp_color_profile_row_separator_func,
NULL, NULL);
/* See issues #2828 and #2642. */
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (combo_box), 1);
}
static void

3
libgimpwidgets/gimpintcombobox.c
View File

@ -930,9 +930,6 @@ gimp_int_combo_box_create_cells (GimpIntComboBox *combo_box)
for (; attached_menus; attached_menus = g_list_next (attached_menus))
queue_resize_cell_view (attached_menus->data);
}
/* See issues #2828 and #2642. */
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (combo_box), 1);
}
static void

3
libgimpwidgets/gimpstringcombobox.c
View File

@ -159,9 +159,6 @@ gimp_string_combo_box_constructed (GObject *object)
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), cell,
"text", priv->label_column,
NULL);
/* See issues #2828 and #2642. */
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (object), 1);
}
static void

3
libgimpwidgets/gimpunitcombobox.c
View File

@ -83,9 +83,6 @@ gimp_unit_combo_box_init (GimpUnitComboBox *combo)
g_signal_connect (combo, "notify::popup-shown",
G_CALLBACK (gimp_unit_combo_box_popup_shown),
NULL);
/* See issues #2828 and #2642. */
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (combo), 1);
}
static void