diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-04-29 18:29:14 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-04-29 18:29:14 +0000 |
| commit | f8f91095a30c7fd3a25228e1a480606cbe15c4bf (patch) | |
| tree | 8d9fce01286c28e43a154e361f616e5debdc925f /gtk | |
| parent | 6cc1548c5f820223adab0b4e8a8d92afd2cb7d89 (diff) | |
| parent | 30b12ff89081882aa15b70a40d7764c58fbba37f (diff) | |
| download | gtk+-f8f91095a30c7fd3a25228e1a480606cbe15c4bf.tar.gz | |
Merge branch 'matthiasc/for-main' into 'main'
widget: Cosmetics
See merge request GNOME/gtk!5892
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkwidget.c | 12 | ||||
| -rw-r--r-- | gtk/gtkwidgetprivate.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 1ff1e14af5..785e86c17d 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -2308,7 +2308,7 @@ gtk_widget_init (GTypeInstance *instance, gpointer g_class) priv->prev_sibling = NULL; priv->next_sibling = NULL; priv->baseline = -1; - priv->allocated_size_baseline = -1; + priv->allocated_baseline = -1; priv->sensitive = TRUE; priv->alloc_needed = TRUE; @@ -2806,7 +2806,7 @@ gtk_widget_real_hide (GtkWidget *widget) g_clear_pointer (&priv->allocated_transform, gsk_transform_unref); priv->allocated_width = 0; priv->allocated_height = 0; - priv->allocated_size_baseline = 0; + priv->allocated_baseline = 0; g_clear_pointer (&priv->transform, gsk_transform_unref); priv->width = 0; priv->height = 0; @@ -3979,14 +3979,14 @@ gtk_widget_allocate (GtkWidget *widget, /* Preserve request/allocate ordering */ priv->alloc_needed = FALSE; - baseline_changed = priv->allocated_size_baseline != baseline; + baseline_changed = priv->allocated_baseline != baseline; transform_changed = !gsk_transform_equal (priv->allocated_transform, transform); gsk_transform_unref (priv->allocated_transform); priv->allocated_transform = gsk_transform_ref (transform); priv->allocated_width = width; priv->allocated_height = height; - priv->allocated_size_baseline = baseline; + priv->allocated_baseline = baseline; if (_gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) adjusted.x = priv->margin.left; @@ -5730,7 +5730,7 @@ _gtk_widget_set_visible_flag (GtkWidget *widget, g_clear_pointer (&priv->allocated_transform, gsk_transform_unref); priv->allocated_width = 0; priv->allocated_height = 0; - priv->allocated_size_baseline = 0; + priv->allocated_baseline = 0; g_clear_pointer (&priv->transform, gsk_transform_unref); priv->width = 0; priv->height = 0; @@ -10764,7 +10764,7 @@ gtk_widget_ensure_allocate (GtkWidget *widget) gtk_widget_allocate (widget, priv->allocated_width, priv->allocated_height, - priv->allocated_size_baseline, + priv->allocated_baseline, gsk_transform_ref (priv->allocated_transform)); } else diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h index b73b6292be..be600186e0 100644 --- a/gtk/gtkwidgetprivate.h +++ b/gtk/gtkwidgetprivate.h @@ -153,7 +153,7 @@ struct _GtkWidgetPrivate GskTransform *allocated_transform; int allocated_width; int allocated_height; - int allocated_size_baseline; + int allocated_baseline; int width; int height; |