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

[Matthias Clasen <matthiasc src gnome org>]

commit fe45f283afc7ab70df2d97e25555885ff771e200
Merge: 9d51821e84 5556907194
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Mar 9 23:59:05 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    inspector: Fix surface transform regression
    
    See merge request GNOME/gtk!3280

 gtk/gtkwidget.c                |  4 +++-
 gtk/inspector/updatesoverlay.c |  7 +------
 gtk/inspector/window.c         | 19 ++++++++++---------
 gtk/inspector/window.h         |  3 ++-
 4 files changed, 16 insertions(+), 17 deletions(-)
---