[gtk: 8/8] Merge branch 'new-text-attributes' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 8/8] Merge branch 'new-text-attributes' into 'master'
- Date: Sat, 21 Mar 2020 05:57:15 +0000 (UTC)
commit a67893fe5a14a006f08aa8c803e2f667b332893c
Merge: 28e7a0a565 9259efb5d7
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Mar 21 05:56:22 2020 +0000
Merge branch 'new-text-attributes' into 'master'
New text attributes
See merge request GNOME/gtk!1547
demos/gtk-demo/markup.c | 2 +-
demos/gtk-demo/markup.txt | 4 +
gtk/gtktextattributes.c | 38 ++++++++-
gtk/gtktextattributes.h | 6 ++
gtk/gtktextbuffer.c | 32 +++++++
gtk/gtktextlayout.c | 93 ++++++++++++++++++--
gtk/gtktexttag.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++
gtk/gtktexttagprivate.h | 5 ++
meson.build | 2 +-
9 files changed, 386 insertions(+), 8 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]