[gtk: 6/6] Merge branch 'color-picker' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 6/6] Merge branch 'color-picker' into 'master'
- Date: Fri, 27 Jul 2018 18:38:23 +0000 (UTC)
commit 2c5f2a2bcb0a29660828c638619b4a8d4e5e30cb
Merge: 766e2b1e63 b6d990af25
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jul 27 18:35:05 2018 +0000
Merge branch 'color-picker' into 'master'
Color picker
See merge request GNOME/gtk!273
gtk/gtkcoloreditor.c | 42 +++++++
gtk/gtkcolorpicker.c | 59 +++++++++
gtk/gtkcolorpickerportal.c | 239 +++++++++++++++++++++++++++++++++++++
gtk/gtkcolorpickerportalprivate.h | 41 +++++++
gtk/gtkcolorpickerprivate.h | 69 +++++++++++
gtk/gtkcolorpickershell.c | 183 ++++++++++++++++++++++++++++
gtk/gtkcolorpickershellprivate.h | 41 +++++++
gtk/meson.build | 3 +
gtk/ui/gtkcoloreditor.ui | 14 +++
testsuite/a11y/assistant.txt | 6 +-
testsuite/a11y/colorchooser.txt | 26 +++-
testsuite/a11y/menu.txt | 8 --
testsuite/a11y/menubutton.txt | 8 --
testsuite/a11y/menubutton2.txt | 34 ++----
testsuite/a11y/menubutton3.txt | 34 ++----
testsuite/a11y/paned.txt | 2 +-
testsuite/a11y/scale-drawvalue.txt | 8 --
testsuite/a11y/tooltips.txt | 8 --
18 files changed, 742 insertions(+), 83 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]