[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/libhandy-1][debian/master] 2 commits: Backport HdyCarousel fixes

[Guido Günther]

Guido Günther pushed to branch debian/master at Debian On Mobile / libhandy-1


Commits:
e5d8d3d7 by Sebastian Krzyszkowiak at 2020-10-25T23:10:48+01:00
Backport HdyCarousel fixes

Upstream commits ddfd9b75e9db1fae9166debb13dc188f68d0f90e and
bdfb9a99e20b5a3139f9828beb95266188af271f.

See also https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/623

- - - - -
d0f9833c by Guido Günther at 2020-10-26T08:05:51+00:00
Merge branch 'carousel-fixes' into 'debian/master'

Backport HdyCarousel fixes

See merge request DebianOnMobile-team/libhandy-1!8
- - - - -


3 changed files:

- + debian/patches/carousel-box-Don-t-invalidate-cache-on-any-allocatio.patch
- + debian/patches/carousel-box-Null-check-child-in-get_page_at_positio.patch
- debian/patches/series


Changes:

=====================================
debian/patches/carousel-box-Don-t-invalidate-cache-on-any-allocatio.patch
=====================================
@@ -0,0 +1,27 @@
+From bdfb9a99e20b5a3139f9828beb95266188af271f Mon Sep 17 00:00:00 2001
+From: Alexander Mikhaylenko <alexm at gnome.org>
+Date: Fri, 9 Oct 2020 13:13:23 +0500
+Subject: [PATCH 2/2] carousel-box: Don't invalidate cache on any allocation
+
+Welp.
+
+Fixes https://gitlab.gnome.org/GNOME/libhandy/-/issues/304
+---
+ src/hdy-carousel-box.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/hdy-carousel-box.c b/src/hdy-carousel-box.c
+index cf6e6eb..0c4c575 100644
+--- a/src/hdy-carousel-box.c
++++ b/src/hdy-carousel-box.c
+@@ -903,7 +903,6 @@ hdy_carousel_box_size_allocate (GtkWidget     *widget,
+     gtk_widget_size_allocate (child, &alloc);
+   }
+ 
+-  invalidate_drawing_cache (self);
+   gtk_widget_set_clip (widget, allocation);
+ }
+ 
+-- 
+2.29.1
+


=====================================
debian/patches/carousel-box-Null-check-child-in-get_page_at_positio.patch
=====================================
@@ -0,0 +1,36 @@
+From ddfd9b75e9db1fae9166debb13dc188f68d0f90e Mon Sep 17 00:00:00 2001
+From: Alexander Mikhaylenko <alexm at gnome.org>
+Date: Thu, 8 Oct 2020 12:18:35 +0500
+Subject: [PATCH 1/2] carousel-box: Null-check child in get_page_at_position()
+
+It can be null when there are no children in the carousel.
+---
+ src/hdy-carousel-box.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/hdy-carousel-box.c b/src/hdy-carousel-box.c
+index 1e0355f..cf6e6eb 100644
+--- a/src/hdy-carousel-box.c
++++ b/src/hdy-carousel-box.c
+@@ -1723,7 +1723,7 @@ hdy_carousel_box_get_closest_snap_point (HdyCarouselBox *self)
+  * the current position, the returned widget will match the currently
+  * displayed page.
+  *
+- * Returns: the closest page.
++ * Returns: (nullable): the closest page.
+  *
+  * Since: 1.0
+  */
+@@ -1742,6 +1742,9 @@ hdy_carousel_box_get_page_at_position (HdyCarouselBox *self,
+ 
+   child = get_closest_child_at (self, position, TRUE, FALSE);
+ 
++  if (!child)
++    return NULL;
++
+   return child->widget;
+ }
+ 
+-- 
+2.29.1
+


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
 Disable-atk-during-tests.patch
 swipe-tracker-Special-case-dragging-from-buttons.patch
+carousel-box-Null-check-child-in-get_page_at_positio.patch
+carousel-box-Don-t-invalidate-cache-on-any-allocatio.patch



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/libhandy-1/-/compare/d9b1213f9c964cab24cc96de766b7c10456b5e10...d0f9833cd8b9d9d52e11eeca51261eea9319b672

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/libhandy-1/-/compare/d9b1213f9c964cab24cc96de766b7c10456b5e10...d0f9833cd8b9d9d52e11eeca51261eea9319b672
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20201026/8dd6f0b2/attachment-0001.html>