[gtk: 22/22] Merge branch 'matthiasc/css-change-tracking-4' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 22/22] Merge branch 'matthiasc/css-change-tracking-4' into 'master'
- Date: Sat, 18 Jan 2020 05:42:54 +0000 (UTC)
commit 03883b8b1a58e6c5695b3c13ffe5add638a94605
Merge: 23f84e3a3d f28cd6cea9
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Jan 18 05:41:26 2020 +0000
Merge branch 'matthiasc/css-change-tracking-4' into 'master'
Improve change computation
See merge request GNOME/gtk!1327
gdk/filetransferportal.c | 388 ++++++++++++++++----------
gdk/filetransferportalprivate.h | 3 +-
gdk/gdkcontentdeserializer.c | 106 +------
gdk/gdkcontentserializer.c | 77 +----
gtk/gen-gtk-gresources-xml.py | 1 +
gtk/gtkcssmatcher.c | 170 -----------
gtk/gtkcssmatcherprivate.h | 19 +-
gtk/gtkcssnode.c | 20 +-
gtk/gtkcssnodedeclaration.c | 22 +-
gtk/gtkcssprovider.c | 37 +--
gtk/gtkcssselector.c | 137 +++++++--
gtk/gtkcssselectorprivate.h | 2 +
gtk/gtkcsstypesprivate.h | 1 +
gtk/gtkstylecontext.h | 3 +-
gtk/gtkwidget.c | 2 +-
gtk/theme/Empty/gtk.css | 1 +
testsuite/css/change/change.test.in | 4 +
testsuite/css/change/meson.build | 40 +++
testsuite/css/change/test-css-change.c | 309 ++++++++++++++++++++
testsuite/css/change/test1.css | 13 +
testsuite/css/change/test1.nodes | 5 +
testsuite/css/change/test1.ui | 26 ++
testsuite/css/change/test2.css | 186 ++++++++++++
testsuite/css/change/test2.nodes | 48 ++++
testsuite/css/change/test2.ui | 237 ++++++++++++++++
testsuite/css/change/test3.css | 21 ++
testsuite/css/change/test3.nodes | 5 +
testsuite/css/change/test3.ui | 26 ++
testsuite/css/change/test4.css | 25 ++
testsuite/css/change/test4.nodes | 8 +
testsuite/css/change/test4.ui | 39 +++
testsuite/css/change/test5.css | 5 +
testsuite/css/change/test5.nodes | 10 +
testsuite/css/change/test5.ui | 36 +++
testsuite/css/meson.build | 1 +
testsuite/css/nodes/box.ltr.nodes | 2 +-
testsuite/css/nodes/box.rtl.nodes | 2 +-
testsuite/css/nodes/buttons.nodes | 2 +-
testsuite/css/nodes/checkbutton.ltr.nodes | 2 +-
testsuite/css/nodes/checkbutton.rtl.nodes | 2 +-
testsuite/css/nodes/combobox.nodes | 6 +-
testsuite/css/nodes/entries.nodes | 4 +-
testsuite/css/nodes/expander.ltr.nodes | 2 +-
testsuite/css/nodes/expander.rtl.nodes | 2 +-
testsuite/css/nodes/levelbar.ltr.nodes | 54 ++--
testsuite/css/nodes/levelbar.rtl.nodes | 54 ++--
testsuite/css/nodes/notebook-arrows.nodes | 6 +-
testsuite/css/nodes/notebook-arrows2.nodes | 6 +-
testsuite/css/nodes/notebook-arrows2.ui | 1 +
testsuite/css/nodes/notebook.bottom.ltr.nodes | 2 +-
testsuite/css/nodes/notebook.bottom.rtl.nodes | 2 +-
testsuite/css/nodes/notebook.left.ltr.nodes | 4 +-
testsuite/css/nodes/notebook.left.rtl.nodes | 4 +-
testsuite/css/nodes/notebook.right.ltr.nodes | 4 +-
testsuite/css/nodes/notebook.right.rtl.nodes | 4 +-
testsuite/css/nodes/notebook.top.ltr.nodes | 4 +-
testsuite/css/nodes/notebook.top.rtl.nodes | 4 +-
testsuite/css/nodes/paned.ltr.nodes | 2 +-
testsuite/css/nodes/paned.rtl.nodes | 2 +-
testsuite/css/nodes/progressbar.nodes | 2 +-
testsuite/css/nodes/scale.nodes | 4 +-
testsuite/css/nodes/test-css-nodes.c | 45 ++-
testsuite/css/style/adjacent-states.nodes | 2 +-
testsuite/css/style/colornames.css | 2 +-
testsuite/css/style/colornames.nodes | 3 +-
testsuite/css/style/currentcolor.nodes | 2 +-
testsuite/css/style/font.nodes | 2 +-
testsuite/css/style/gradient.nodes | 2 +-
testsuite/css/style/inherit.nodes | 2 +-
testsuite/css/style/label.nodes | 2 +-
testsuite/css/style/nth-child.nodes | 2 +-
testsuite/css/style/test-css-style.c | 59 ++--
72 files changed, 1614 insertions(+), 725 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]