[gtk: 12/12] Merge branch 'wip/matthiasc/emoji-picker' into 'master'



commit 29d77be03f79f17e97b0db1575eba87ecaf0d222
Merge: 7bb98674d0 8be12a2427
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Apr 24 00:38:20 2018 +0000

    Merge branch 'wip/matthiasc/emoji-picker' into 'master'
    
    Wip/matthiasc/emoji picker
    
    See merge request GNOME/gtk!115

 demos/widget-factory/widget-factory.ui |   3 +-
 gtk/gtkemojicompletion.c               | 665 +++++++++++++++++++++++++++++++++
 gtk/gtkemojicompletion.h               |  41 ++
 gtk/gtkentry.c                         |  51 ++-
 gtk/gtkentryprivate.h                  |   7 +
 gtk/gtkimcontextsimple.c               | 265 ++-----------
 gtk/meson.build                        |   1 +
 gtk/theme/Adwaita/_common.scss         |  16 +-
 gtk/ui/gtkemojicompletion.ui           |  16 +
 po/POTFILES.in                         |   2 +
 10 files changed, 819 insertions(+), 248 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]