Commit 846d242f authored by Ell's avatar Ell
Browse files

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 #2828 (comment 421312) for
the rationale.

This reverts commits 1d984542,
68a33ab5, and
6dfca83c.
parent 234f76b6
......@@ -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
......
......@@ -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,
......
......@@ -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
......
......@@ -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);
}
/**
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment