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




commit 6e594da5f234d092beb3bb5156ff554be01a815a
Merge: 949f22b8b2 ac79c0e799
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Oct 3 19:27:15 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    Closes #506
    
    See merge request GNOME/gtk!2655

 .../gtk-demo/{transition3.glsl => crosswarp.glsl}  |   0
 demos/gtk-demo/demo.gresource.xml                  |  10 +-
 demos/gtk-demo/gltransition.c                      |  10 +-
 .../{transition4.glsl => kaleidoscope.glsl}        |   0
 demos/gtk-demo/{transition2.glsl => radial.glsl}   |   0
 demos/gtk-demo/{transition1.glsl => wind.glsl}     |   0
 demos/node-editor/node-editor-window.c             |  13 +-
 docs/reference/gtk/gtk4-sections.txt               |  27 +-
 gsk/gskrendernodeparser.c                          |  71 ++++-
 gtk/gtkcolorbutton.c                               |  28 +-
 gtk/gtkdirectorylist.c                             |  17 --
 gtk/gtkicontheme.c                                 |  18 ++
 gtk/gtkicontheme.h                                 |   3 +
 gtk/gtkspinbutton.c                                |  39 +++
 gtk/gtkspinbutton.h                                |  92 +++---
 gtk/gtktestutils.c                                 |   3 +-
 gtk/gtktext.c                                      | 172 +++++++++--
 gtk/gtktext.h                                      |  21 ++
 gtk/gtktextbuffer.c                                |  66 ++--
 gtk/gtktextbuffer.h                                |  34 +--
 testsuite/gsk/nodeparser/empty-texture.ref.node    |   5 +-
 testsuite/gsk/nodeparser/widgetfactory.node        | 327 +++++++++++++++++---
 testsuite/gtk/accessor-apis.c                      | 336 +++++++++++++++++++++
 testsuite/gtk/meson.build                          |   4 +
 testsuite/gtk/textbuffer.c                         |  46 +--
 25 files changed, 1090 insertions(+), 252 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]