[gimp] app: revert combo-box drop-down changes
- From: Ell <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: revert combo-box drop-down changes
- Date: Thu, 28 Mar 2019 00:30:53 +0000 (UTC)
commit 846d242f301b6ee8d62169d18bca61eaa3057a8b
Author: Ell <ell_se yahoo com>
Date: Wed Mar 27 16:50:57 2019 -0400
app: revert combo-box drop-down changes
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 1d984542e9a4673dc81baa3d60d389e3bb3c2d03,
68a33ab5bda1470453d5856afc5bc499631b6da7, and
6dfca83c2a5ee8d053150e85e2047702d67eb4e7.
app/display/gimpscalecombobox.c | 3 ---
app/display/gimpstatusbar.c | 3 +++
app/widgets/gimpcontainercombobox.c | 3 ---
app/widgets/gimplanguagecombobox.c | 3 ---
libgimpwidgets/gimpcolorprofilecombobox.c | 3 ---
libgimpwidgets/gimpintcombobox.c | 3 ---
libgimpwidgets/gimpstringcombobox.c | 3 ---
libgimpwidgets/gimpunitcombobox.c | 3 ---
8 files changed, 3 insertions(+), 21 deletions(-)
---
diff --git a/app/display/gimpscalecombobox.c b/app/display/gimpscalecombobox.c
index 5523f7cbd8..104952d4cc 100644
--- a/app/display/gimpscalecombobox.c
+++ b/app/display/gimpscalecombobox.c
@@ -170,9 +170,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
diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c
index 877f587220..ed8d9d8532 100644
--- a/app/display/gimpstatusbar.c
+++ b/app/display/gimpstatusbar.c
@@ -224,6 +224,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,
diff --git a/app/widgets/gimpcontainercombobox.c b/app/widgets/gimpcontainercombobox.c
index 8c34384c06..87e2af8eac 100644
--- a/app/widgets/gimpcontainercombobox.c
+++ b/app/widgets/gimpcontainercombobox.c
@@ -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
diff --git a/app/widgets/gimplanguagecombobox.c b/app/widgets/gimplanguagecombobox.c
index 5a2e13b457..428277408e 100644
--- a/app/widgets/gimplanguagecombobox.c
+++ b/app/widgets/gimplanguagecombobox.c
@@ -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);
}
/**
diff --git a/libgimpwidgets/gimpcolorprofilecombobox.c b/libgimpwidgets/gimpcolorprofilecombobox.c
index 99035c3de5..fa6de162f8 100644
--- a/libgimpwidgets/gimpcolorprofilecombobox.c
+++ b/libgimpwidgets/gimpcolorprofilecombobox.c
@@ -155,9 +155,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
diff --git a/libgimpwidgets/gimpintcombobox.c b/libgimpwidgets/gimpintcombobox.c
index 0616080df1..ec80b6be38 100644
--- a/libgimpwidgets/gimpintcombobox.c
+++ b/libgimpwidgets/gimpintcombobox.c
@@ -902,9 +902,6 @@ gimp_int_combo_box_create_cells (GimpIntComboBox *combo_box)
priv, NULL);
}
}
-
- /* See issues #2828 and #2642. */
- gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (combo_box), 1);
}
static void
diff --git a/libgimpwidgets/gimpstringcombobox.c b/libgimpwidgets/gimpstringcombobox.c
index c817162e20..a25bc194dc 100644
--- a/libgimpwidgets/gimpstringcombobox.c
+++ b/libgimpwidgets/gimpstringcombobox.c
@@ -158,9 +158,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
diff --git a/libgimpwidgets/gimpunitcombobox.c b/libgimpwidgets/gimpunitcombobox.c
index b648b5c000..ac0840b9de 100644
--- a/libgimpwidgets/gimpunitcombobox.c
+++ b/libgimpwidgets/gimpunitcombobox.c
@@ -72,9 +72,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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]