[gtk: 6/6] Merge branch 'matthiasc/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 8e4cc59a7a61a4633de453dc4e61a902c11f036c
Merge: c17227966d a2ce6268b2
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Nov 20 02:02:10 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    See merge request GNOME/gtk!2870

 demos/gtk-demo/builder.c                           |   2 +-
 demos/gtk-demo/constraints.ui                      | 106 -----
 .../{constraints4.c => constraints_builder.c}      |  12 +-
 demos/gtk-demo/constraints_builder.ui              | 460 +++++++++++++++++++++
 .../{constraints2.c => constraints_interactive.c}  |   2 +-
 .../gtk-demo/{constraints3.c => constraints_vfl.c} |   2 +-
 demos/gtk-demo/demo.gresource.xml                  |  18 +-
 demos/gtk-demo/{listbox2.c => listbox_controls.c}  |   4 +-
 .../gtk-demo/{listbox2.ui => listbox_controls.ui}  |   0
 demos/gtk-demo/meson.build                         |  10 +-
 .../gtk-demo/{overlay2.c => overlay_decorative.c}  |   2 +-
 demos/gtk-demo/sliding_puzzle.c                    |   5 +-
 gtk/gtkenums.h                                     |  12 +-
 gtk/gtkscrollbar.c                                 |   8 +-
 14 files changed, 498 insertions(+), 145 deletions(-)
---