mirror of https://github.com/GNOME/gimp.git
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 commits1d984542e9
,68a33ab5bd
, and6dfca83c2a
.
This commit is contained in:
parent
234f76b6fb
commit
846d242f30
|
@ -170,9 +170,6 @@ gimp_scale_combo_box_constructed (GObject *object)
|
||||||
g_signal_connect (entry, "key-press-event",
|
g_signal_connect (entry, "key-press-event",
|
||||||
G_CALLBACK (gimp_scale_combo_box_entry_key_press),
|
G_CALLBACK (gimp_scale_combo_box_entry_key_press),
|
||||||
combo_box);
|
combo_box);
|
||||||
|
|
||||||
/* See issues #2828 and #2642. */
|
|
||||||
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (object), 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -224,6 +224,9 @@ gimp_statusbar_init (GimpStatusbar *statusbar)
|
||||||
statusbar->unit_combo = gimp_unit_combo_box_new_with_model (store);
|
statusbar->unit_combo = gimp_unit_combo_box_new_with_model (store);
|
||||||
g_object_unref (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);
|
gtk_widget_set_can_focus (statusbar->unit_combo, FALSE);
|
||||||
g_object_set (statusbar->unit_combo, "focus-on-click", FALSE, NULL);
|
g_object_set (statusbar->unit_combo, "focus-on-click", FALSE, NULL);
|
||||||
gtk_box_pack_start (GTK_BOX (hbox), statusbar->unit_combo,
|
gtk_box_pack_start (GTK_BOX (hbox), statusbar->unit_combo,
|
||||||
|
|
|
@ -177,9 +177,6 @@ gimp_container_combo_box_init (GimpContainerComboBox *combo)
|
||||||
combo);
|
combo);
|
||||||
|
|
||||||
gtk_widget_set_sensitive (GTK_WIDGET (combo), FALSE);
|
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
|
static void
|
||||||
|
|
|
@ -62,9 +62,6 @@ gimp_language_combo_box_init (GimpLanguageComboBox *combo)
|
||||||
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
|
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
|
||||||
"text", GIMP_LANGUAGE_STORE_LABEL,
|
"text", GIMP_LANGUAGE_STORE_LABEL,
|
||||||
NULL);
|
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),
|
gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo_box),
|
||||||
gimp_color_profile_row_separator_func,
|
gimp_color_profile_row_separator_func,
|
||||||
NULL, NULL);
|
NULL, NULL);
|
||||||
|
|
||||||
/* See issues #2828 and #2642. */
|
|
||||||
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (combo_box), 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -902,9 +902,6 @@ gimp_int_combo_box_create_cells (GimpIntComboBox *combo_box)
|
||||||
priv, NULL);
|
priv, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* See issues #2828 and #2642. */
|
|
||||||
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (combo_box), 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -158,9 +158,6 @@ gimp_string_combo_box_constructed (GObject *object)
|
||||||
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), cell,
|
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), cell,
|
||||||
"text", priv->label_column,
|
"text", priv->label_column,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
/* See issues #2828 and #2642. */
|
|
||||||
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (object), 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -72,9 +72,6 @@ gimp_unit_combo_box_init (GimpUnitComboBox *combo)
|
||||||
g_signal_connect (combo, "notify::popup-shown",
|
g_signal_connect (combo, "notify::popup-shown",
|
||||||
G_CALLBACK (gimp_unit_combo_box_popup_shown),
|
G_CALLBACK (gimp_unit_combo_box_popup_shown),
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
/* See issues #2828 and #2642. */
|
|
||||||
gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (combo), 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue