[gtk: 19/19] Merge branch 'wip/baedert/for-master' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 19/19] Merge branch 'wip/baedert/for-master' into 'master'
- Date: Mon, 11 May 2020 14:25:26 +0000 (UTC)
commit 329994291a0f4220b3ebbb36ebda8fc22c1709ec
Merge: 2d97357136 52ae384bfd
Author: Matthias Clasen <mclasen redhat com>
Date: Mon May 11 14:24:45 2020 +0000
Merge branch 'wip/baedert/for-master' into 'master'
Wip/baedert/for master
See merge request GNOME/gtk!1867
gsk/gl/gskglrenderer.c | 2 +-
gsk/resources/glsl/border.glsl | 8 +-
gsk/resources/glsl/inset_shadow.glsl | 9 +-
gsk/resources/glsl/linear_gradient.glsl | 10 +-
gsk/resources/glsl/outset_shadow.glsl | 7 +-
gsk/resources/glsl/preamble.fs.glsl | 25 +-
gsk/resources/glsl/unblurred_outset_shadow.glsl | 9 +-
gtk/gtkarrayimplprivate.h | 19 +-
gtk/gtkcellrenderertoggle.c | 58 +-
gtk/gtkcssanimatedstyle.c | 27 +-
gtk/gtkcssanimation.c | 69 ++-
gtk/gtkcssanimationprivate.h | 8 +-
gtk/gtkcsscalcvalue.c | 289 ----------
gtk/gtkcsscalcvalueprivate.h | 3 -
gtk/gtkcssdimensionvalue.c | 376 -------------
gtk/gtkcssdimensionvalueprivate.h | 6 -
gtk/gtkcssdynamic.c | 40 +-
gtk/gtkcssdynamicprivate.h | 20 -
gtk/gtkcssimagecrossfade.c | 2 +-
gtk/gtkcssnumbervalue.c | 701 ++++++++++++++++++++++--
gtk/gtkcssnumbervalueprivate.h | 24 +-
gtk/gtkcssstyle.c | 2 -
gtk/gtkcsstransition.c | 103 ++--
gtk/gtkcsstransitionprivate.h | 20 +-
gtk/gtkcssvalue.c | 5 -
gtk/gtkprintunixdialog.c | 34 +-
gtk/gtkscrolledwindow.c | 11 +-
gtk/gtkstyleanimation.c | 93 +---
gtk/gtkstyleanimationprivate.h | 17 +-
gtk/gtkstylecontext.c | 75 +--
gtk/gtkstylecontextprivate.h | 7 -
gtk/gtkwidget.c | 63 +--
tests/testtreeview.c | 2 +-
33 files changed, 974 insertions(+), 1170 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]