[gtk: 56/56] Merge branch 'matthiasc/for-master' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 56/56] Merge branch 'matthiasc/for-master' into 'master'
- Date: Mon, 2 Nov 2020 11:52:15 +0000 (UTC)
commit efc314196d639a6216add81b440495a556f2183e
Merge: 924796b478 403a70ca89
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Nov 2 11:52:13 2020 +0000
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/gtk!2769
NEWS | 34 +-
config.h.meson | 5 +-
demos/gtk-demo/constraints.c | 12 +-
demos/gtk-demo/constraints.ui | 105 +++++
demos/gtk-demo/constraints2.c | 2 +-
demos/gtk-demo/constraints3.c | 4 +
demos/gtk-demo/constraints4.c | 72 ++++
demos/gtk-demo/demo.gresource.xml | 4 +
demos/gtk-demo/meson.build | 1 +
gsk/gskrenderer.c | 6 +-
gsk/meson.build | 2 -
gtk/css/gtkcsstokenizer.c | 2 +-
gtk/css/meson.build | 1 -
gtk/gtkbuildable.c | 29 --
gtk/gtkbuildableprivate.h | 4 -
gtk/gtkconstraintlayout.c | 54 ++-
gtk/gtkexpression.c | 4 +-
gtk/gtkhsla.c | 18 -
gtk/gtkhslaprivate.h | 5 -
gtk/gtkrender.c | 1 -
gtk/gtksettings.c | 1 -
gtk/gtkstringlist.c | 22 -
gtk/gtkwidget.c | 2 +-
gtk/tools/gtk-builder-tool-simplify.c | 467 +++++++++++----------
gtk/tools/gtk-builder-tool-validate.c | 2 +-
gtk/tools/gtk-builder-tool.c | 55 +++
testsuite/css/change/meson.build | 11 +-
testsuite/css/data.c | 37 +-
testsuite/css/nodes/meson.build | 11 +-
testsuite/css/parser/cdo-cdc.css | 7 +
testsuite/css/parser/cdo-cdc.ref.css | 3 +
testsuite/css/parser/meson.build | 16 +
testsuite/css/parser/url-invalid1.css | 4 +
testsuite/css/parser/url-invalid1.errors | 1 +
testsuite/css/parser/url-invalid1.ref.css | 0
testsuite/css/parser/url-invalid2.css | 4 +
testsuite/css/parser/url-invalid2.errors | 1 +
testsuite/css/parser/url-invalid2.ref.css | 0
testsuite/css/parser/url-valid1.css | 3 +
testsuite/css/parser/url-valid1.ref.css | 3 +
testsuite/css/parser/url-valid2.css | 4 +
testsuite/css/parser/url-valid2.ref.css | 3 +
testsuite/css/parser/url-valid3.css | 4 +
testsuite/css/parser/url-valid3.ref.css | 3 +
testsuite/css/style/meson.build | 11 +-
testsuite/gdk/displaymanager.c | 55 +++
testsuite/gdk/keysyms.c | 74 +++-
testsuite/gdk/meson.build | 2 +
testsuite/gdk/rectangle.c | 44 ++
testsuite/gdk/seat.c | 39 +-
testsuite/gdk/texture.c | 120 ++++++
testsuite/gtk/expression.c | 70 ++-
testsuite/gtk/filter.c | 30 +-
testsuite/gtk/main.c | 16 +
testsuite/gtk/sorter.c | 7 +
testsuite/gtk/stringlist.c | 13 +
testsuite/gtk/ui/constraints.expected | 1 +
testsuite/gtk/ui/constraints.ui | 107 +++++
testsuite/tools/meson.build | 3 +-
testsuite/tools/simplify-3to4.in | 16 +-
.../tools/simplify-data-3to4/actionbar.expected | 13 +
testsuite/tools/simplify-data-3to4/actionbar.ui | 14 +
testsuite/tools/simplify-data-3to4/fixed.expected | 14 +
testsuite/tools/simplify-data-3to4/fixed.ui | 16 +
.../tools/simplify-data-3to4/headerbar.expected | 5 +
testsuite/tools/simplify-data-3to4/headerbar.ui | 9 +
.../tools/simplify-data-3to4/overlay.expected | 17 +
testsuite/tools/simplify-data-3to4/overlay.ui | 20 +
testsuite/tools/simplify-data-3to4/paned.expected | 14 +
testsuite/tools/simplify-data-3to4/paned.ui | 25 ++
testsuite/tools/simplify-data-3to4/test1.expected | 10 -
.../tools/simplify-data-3to4/toolbar.expected | 24 ++
testsuite/tools/simplify-data-3to4/toolbar.ui | 27 ++
testsuite/tools/simplify.in | 16 +-
testsuite/tools/validate-data/invalid1.expected | 1 +
testsuite/tools/validate-data/invalid1.ui | 5 +
testsuite/tools/validate-data/invalid2.expected | 1 +
testsuite/tools/validate-data/invalid2.ui | 6 +
testsuite/tools/validate-data/invalid3.expected | 1 +
testsuite/tools/validate-data/invalid3.ui | 4 +
testsuite/tools/validate-data/invalid4.expected | 1 +
testsuite/tools/validate-data/invalid4.ui | 7 +
testsuite/tools/validate-data/valid1.expected | 0
testsuite/tools/validate-data/valid1.ui | 3 +
testsuite/tools/validate-data/valid2.expected | 0
testsuite/tools/validate-data/valid2.ui | 4 +
testsuite/tools/validate.in | 35 ++
87 files changed, 1548 insertions(+), 381 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]