[libadwaita/wip/exalm/squeezer: 1/2] squeezer: Support switch_threshold_policy when vertical
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libadwaita/wip/exalm/squeezer: 1/2] squeezer: Support switch_threshold_policy when vertical
- Date: Mon, 8 Aug 2022 09:00:54 +0000 (UTC)
commit 68b98b99e781fb694019be1756ae66d559805c81
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Mon Aug 8 12:59:02 2022 +0400
squeezer: Support switch_threshold_policy when vertical
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 a52d97e0..85d76b9f 100644
--- a/src/adw-squeezer.c
+++ b/src/adw-squeezer.c
@@ -807,7 +807,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;
@@ -822,29 +821,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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]