Merge branch 'matthiasc/for-master' into 'master'

Matthiasc/for master

Closes #3278

See merge request GNOME/gtk!2856
This commit is contained in:
Matthias Clasen 2020-11-17 19:25:05 +00:00
commit c1e05e7c52
2 changed files with 8 additions and 1 deletions

View File

@ -107,7 +107,9 @@ The `plain` build type provided by Meson should only be used when
packaging GTK, and it's expected that packagers will provide their
own compiler flags when building GTK. See the previous section for
the list of environment variables to be used to define compiler and
linker flags.
linker flags. Note that with the plain build type, you are also
responsible for controlling the debugging features of GTK with
`-DG_ENABLE_DEBUG` and `-DG_DISABLE_CAST_CHECKS`.
## Dependencies {#dependencies}

View File

@ -1551,6 +1551,11 @@ constructed (GObject *object)
if (!can_modify)
{
label = gtk_label_new ("");
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_label_set_max_width_chars (GTK_LABEL (label), 20);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_widget_set_hexpand (label, TRUE);
gtk_widget_set_halign (label, GTK_ALIGN_FILL);
gtk_widget_add_css_class (label, "dim-label");
gtk_box_append (GTK_BOX (box), label);