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

[Matthias Clasen <matthiasc src gnome org>]

commit 874b9ef8b0a2ee456be338f0cc91a47452fed17b
Merge: cdc5e83ef2 aeeffe27c2
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Sep 19 21:22:30 2020 +0000

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

 NEWS                        |  12 ++-
 gtk/gtkcolorchooserwidget.c |   1 -
 gtk/gtkcolorscale.c         |  62 +++++------
 gtk/gtkcolorscaleprivate.h  |  40 ++-----
 gtk/gtkmagnifier.c          | 147 +++++++++++--------------
 gtk/gtkmagnifierprivate.h   |  14 ---
 gtk/gtkrevealer.c           | 218 ++++++++++++++++---------------------
 gtk/gtkshortcutswindow.c    | 258 ++++++++++++++++++++------------------------
 gtk/gtkshortcutswindow.h    |   9 +-
 9 files changed, 319 insertions(+), 442 deletions(-)
---