[gtk: 2/2] Merge branch 'scale-button-double-focus' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 6b4d6c3771e40f57b2a5676e7b6821231e76a130
Merge: a11f9fea76 822c2aba36
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Apr 10 01:21:25 2020 +0000

    Merge branch 'scale-button-double-focus' into 'master'
    
    scalebutton: Don't derive from GtkButton
    
    See merge request GNOME/gtk!1655

 demos/widget-factory/widget-factory.c              |  37 ++---
 demos/widget-factory/widget-factory.ui             |   1 -
 gtk/a11y/gtkscalebuttonaccessible.c                |   2 +-
 gtk/a11y/gtkscalebuttonaccessible.h                |   4 +-
 gtk/gtkscalebutton.c                               | 158 ++++++++++-----------
 gtk/ui/gtkscalebutton.ui                           |  11 +-
 gtk/ui/gtkvolumebutton.ui                          |  18 +--
 testsuite/gtk/focus-chain/widget-factory2.tab      |   4 +-
 .../gtk/focus-chain/widget-factory2.tab-backward   |   4 +-
 9 files changed, 105 insertions(+), 134 deletions(-)
---