[gtk: 8/8] Merge branch 'wip/otte/for-master' into 'master'
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 8/8] Merge branch 'wip/otte/for-master' into 'master'
- Date: Tue, 17 Nov 2020 19:08:03 +0000 (UTC)
commit 1c7daece7ac987213c75bf320deaf0e884a39490
Merge: 5cc5022a8f 163c04c101
Author: Benjamin Otte <otte benjamin googlemail com>
Date: Tue Nov 17 19:08:01 2020 +0000
Merge branch 'wip/otte/for-master' into 'master'
Wip/otte/for master
See merge request GNOME/gtk!2855
docs/reference/gsk/gsk4-sections.txt | 46 ++++++-------
gsk/broadway/gskbroadwayrenderer.c | 34 +++++-----
gsk/gl/gskglrenderer.c | 58 ++++++++--------
gsk/gskrendernode.h | 46 ++++++-------
gsk/gskrendernodeimpl.c | 100 +++++++++++++--------------
gsk/gskrendernodeparser.c | 50 +++++++-------
gsk/vulkan/gskvulkanrenderpass.c | 48 ++++++-------
gtk/gtkshortcut.c | 2 +-
gtk/gtksnapshot.c | 118 ++++++++++++++++++++++++--------
gtk/gtktestutils.c | 10 +++
gtk/gtktextbuffer.c | 28 --------
gtk/inspector/recorder.c | 42 ++++++------
gtk/meson.build | 1 +
tests/testcolumnview.c | 2 -
testsuite/gtk/defaultvalue.c | 126 +++++++++++++++++++----------------
testsuite/gtk/notify.c | 6 ++
testsuite/gtk/objects-finalize.c | 6 ++
17 files changed, 398 insertions(+), 325 deletions(-)
---
diff --cc gsk/gskrendernodeimpl.c
index b104372baf,158a35fa2c..e5228d88c9
--- a/gsk/gskrendernodeimpl.c
+++ b/gsk/gskrendernodeimpl.c
@@@ -940,12 -940,11 +940,12 @@@ gsk_border_node_get_outline (GskRenderN
*
* Retrieves the stroke widths of the border.
*
- * Returns: (transfer none): an array of 4 floats for the top,
- * right, bottom and left stroke width of the border
+ * Returns: (transfer none) (array fixed-size=4): an array of 4 floats
+ * for the top, right, bottom and left stroke width of the border,
+ * respectively
*/
const float *
- gsk_border_node_peek_widths (GskRenderNode *node)
+ gsk_border_node_get_widths (GskRenderNode *node)
{
GskBorderNode *self = (GskBorderNode *) node;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]