[libadwaita/wip/exalm/tab-fixes: 15/18] tab-box: Measure the background gizmo
- From: Christopher Davis <christopherdavis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libadwaita/wip/exalm/tab-fixes: 15/18] tab-box: Measure the background gizmo
- Date: Mon, 27 Dec 2021 19:58:34 +0000 (UTC)
commit 96e6ab305363f5bf67ec46c1fbb83f2baf79f673
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Mon Dec 27 15:01:48 2021 +0500
tab-box: Measure the background gizmo
src/adw-tab-box.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/src/adw-tab-box.c b/src/adw-tab-box.c
index 6b895a8a..3064f6c1 100644
--- a/src/adw-tab-box.c
+++ b/src/adw-tab-box.c
@@ -2799,12 +2799,15 @@ adw_tab_box_measure (GtkWidget *widget,
AdwTabBox *self = ADW_TAB_BOX (widget);
int min, nat;
+ gtk_widget_measure (self->background, orientation, -1,
+ &min, &nat, NULL, NULL);
+
if (self->n_tabs == 0) {
if (minimum)
- *minimum = 0;
+ *minimum = min;
if (natural)
- *natural = 0;
+ *natural = nat;
if (minimum_baseline)
*minimum_baseline = -1;
@@ -2832,7 +2835,10 @@ adw_tab_box_measure (GtkWidget *widget,
if (!self->pinned)
width -= OVERLAP;
- min = nat = MAX (self->last_width, width);
+ width = MAX (self->last_width, width);
+
+ min = MAX (min, width);
+ nat = MAX (nat, width);
} else {
GList *l;
@@ -2879,8 +2885,6 @@ adw_tab_box_size_allocate (GtkWidget *widget,
int pos;
double value;
- gtk_widget_measure (self->background, GTK_ORIENTATION_HORIZONTAL, -1,
- NULL, NULL, NULL, NULL);
gtk_widget_allocate (self->background, width, height, baseline, NULL);
adw_tab_box_measure (widget, GTK_ORIENTATION_HORIZONTAL, -1,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]