[gtk: 10/10] Merge branch 'matthiasc/for-master' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 10/10] Merge branch 'matthiasc/for-master' into 'master'
- Date: Sat, 3 Apr 2021 03:20:18 +0000 (UTC)
commit 2f1ff307da6fd6423b38c43aade003f012d4b8e8
Merge: 7cb99a0866 a8e8e04496
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Apr 3 03:20:17 2021 +0000
Merge branch 'matthiasc/for-master' into 'master'
node test: Improve --generate
See merge request GNOME/gtk!3397
demos/node-editor/node-editor-window.c | 19 +
demos/node-editor/node-editor-window.ui | 6 +-
demos/widget-factory/widget-factory.c | 1 +
gsk/gskrendernodeparser.c | 22 +-
gtk/gtkimcontextwayland.c | 1 +
gtk/gtkimmulticontext.c | 3 +
gtk/gtksettings.c | 1 +
gtk/gtktext.c | 2 +
gtk/inspector/recorder.c | 32 +-
gtk/inspector/recorder.ui | 9 +
testsuite/gsk/node-parser.c | 8 +-
testsuite/gsk/nodeparser/blend.ref.node | 4 +-
testsuite/gsk/nodeparser/crash2.ref.node | 8 +-
testsuite/gsk/nodeparser/crash3.ref.node | 8 +-
testsuite/gsk/nodeparser/empty-clip.ref.node | 2 +-
testsuite/gsk/nodeparser/empty-cross-fade.ref.node | 8 +-
.../gsk/nodeparser/empty-linear-gradient.ref.node | 2 +-
.../gsk/nodeparser/empty-rounded-clip.ref.node | 2 +-
testsuite/gsk/nodeparser/empty-shadow.ref.node | 2 +-
testsuite/gsk/nodeparser/shadow.ref.node | 2 +-
testsuite/gsk/nodeparser/testswitch.ref.node | 320 ++
testsuite/gsk/nodeparser/widgetfactory.ref.node | 3130 ++++++++++++++++++++
22 files changed, 3556 insertions(+), 36 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]