[gtk: 5/5] Merge branch 'wip/otte/for-master' into 'master'

[Benjamin Otte <otte src gnome org>]

commit 8a7868d0066d3d40d32b5d06281cfb0c3fee2def
Merge: 935f7f19f3 c4e5242be0
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Fri Nov 5 22:11:00 2021 +0000

    Merge branch 'wip/otte/for-master' into 'master'
    
    Revert "label: Never measure more than max-width-chars"
    
    Closes #4399
    
    See merge request GNOME/gtk!4120

 gtk/gtkboxlayout.c                                 |  52 +++-
 gtk/gtklabel.c                                     | 285 +++++++++++----------
 gtk/gtkpicture.c                                   |   3 +
 ...idth-chars-and-halign-and-infinite-width.ref.ui |   4 +-
 testsuite/reftests/label-sizing.ref.ui             | 108 +++-----
 testsuite/reftests/meson.build                     |   2 +
 .../vbox-with-max-width-chars-label.ref.ui         |  18 ++
 .../reftests/vbox-with-max-width-chars-label.ui    |  18 ++
 8 files changed, 278 insertions(+), 212 deletions(-)
---