[gtk: 4/4] Merge branch 'emblem-demo' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 7ee3439522b2a9fdd84a722e5aefe8ce381c14cc
Merge: e55bdf87b5 71ea619274
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Sep 12 01:33:51 2020 +0000

    Merge branch 'emblem-demo' into 'master'
    
    Emblem demo
    
    See merge request GNOME/gtk!2563

 demos/gtk-demo/demo.gresource.xml      |   1 +
 demos/gtk-demo/meson.build             |   1 +
 demos/gtk-demo/paintable.c             |  14 ++-
 demos/gtk-demo/paintable.h             |   5 +-
 demos/gtk-demo/paintable_animated.c    |  18 +++-
 demos/gtk-demo/paintable_emblem.c      | 186 +++++++++++++++++++++++++++++++++
 demos/gtk-demo/paintable_mediastream.c |   3 +-
 demos/gtk-demo/sliding_puzzle.c        |   2 +-
 demos/gtk-demo/textview.c              |   2 +-
 9 files changed, 218 insertions(+), 14 deletions(-)
---