[libadwaita/libadwaita-1-1] squeezer: Support switch_threshold_policy when vertical

[Alexander Mikhaylenko <alexm src gnome org>]

commit 313e4cc67fc3b00cf2cf2645fa238d4c9990df0d
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Aug 8 12:59:02 2022 +0400

    squeezer: Support switch_threshold_policy when vertical
    
    
    (cherry picked from commit 642bfefa3f3767729732d82e401fdcaaf62fdd00)

 src/adw-squeezer.c | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)
---
diff --git a/src/adw-squeezer.c b/src/adw-squeezer.c
index 15c75fbe..11f9a644 100644
--- a/src/adw-squeezer.c
+++ b/src/adw-squeezer.c
@@ -811,7 +811,6 @@ adw_squeezer_size_allocate (GtkWidget *widget,
   for (l = self->children; l; l = l->next) {
     GtkWidget *child = NULL;
     int child_min, child_nat;
-    int for_size = -1;
     int compare_size;
 
     page = l->data;
@@ -826,29 +825,20 @@ adw_squeezer_size_allocate (GtkWidget *widget,
     if (self->orientation == GTK_ORIENTATION_VERTICAL) {
       compare_size = height;
 
-      if (gtk_widget_get_request_mode (child) == GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH)
-        for_size = width;
-
-      gtk_widget_measure (child, self->orientation, for_size,
-                          &child_min, NULL, NULL, NULL);
-
-      if (child_min <= height)
-        break;
+      gtk_widget_measure (child, self->orientation, -1,
+                          &child_min, &child_nat, NULL, NULL);
     } else {
       compare_size = width;
 
-      if (gtk_widget_get_request_mode (child) == GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT)
-        for_size = height;
-
-      gtk_widget_measure (child, self->orientation, for_size,
+      gtk_widget_measure (child, self->orientation, -1,
                           &child_min, &child_nat, NULL, NULL);
+    }
 
-      if (child_min <= compare_size && self->switch_threshold_policy == ADW_FOLD_THRESHOLD_POLICY_MINIMUM)
-        break;
+    if (child_min <= compare_size && self->switch_threshold_policy == ADW_FOLD_THRESHOLD_POLICY_MINIMUM)
+      break;
 
-      if (child_nat <= compare_size && self->switch_threshold_policy == ADW_FOLD_THRESHOLD_POLICY_NATURAL)
-        break;
-    }
+    if (child_nat <= compare_size && self->switch_threshold_policy == ADW_FOLD_THRESHOLD_POLICY_NATURAL)
+      break;
   }
 
   if (l == NULL && self->allow_none)