Merge branch 'deprecated-get-allocated-width' into 'main'

Deprecated get allocated width

See merge request GNOME/gtk!5894

6 files changed, 17 insertions, 17 deletions

diff --git a/gtk/gtkcolumnview.c b/gtk/gtkcolumnview.c
index 0d223f43d2..9ed0b2d328 100644
--- a/gtk/gtkcolumnview.c
+++ b/gtk/gtkcolumnview.c
@@ -1246,7 +1246,7 @@ update_column_reorder (GtkColumnView *self,
   int size;
 
   column = g_list_model_get_item (G_LIST_MODEL (self->columns), self->drag_pos);
-  width = gtk_widget_get_allocated_width (GTK_WIDGET (self->header));
+  width = gtk_widget_get_width (GTK_WIDGET (self->header));
   gtk_column_view_column_get_allocation (column, NULL, &size);
 
   self->drag_x = CLAMP (x - self->drag_offset, 0, width - size);
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 9b699e885f..6f6747c6e7 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -2378,19 +2378,17 @@ _popover_set_pointing_to_widget (GtkPopover *popover,
 {
   GtkWidget *parent;
   graphene_point_t p;
-  double x, y, w, h;
+  double w, h;
 
   parent = gtk_widget_get_parent (GTK_WIDGET (popover));
 
   if (!gtk_widget_compute_point (target, parent, &GRAPHENE_POINT_INIT (0, 0), &p))
     return;
 
-  x = p.x;
-  y = p.y;
-  w = gtk_widget_get_allocated_width (GTK_WIDGET (target));
-  h = gtk_widget_get_allocated_height (GTK_WIDGET (target));
+  w = gtk_widget_get_width (target);
+  h = gtk_widget_get_height (target);
 
-  gtk_popover_set_pointing_to (popover, &(GdkRectangle){x, y, w, h});
+  gtk_popover_set_pointing_to (popover, &(GdkRectangle){p.x, p.y, w, h});
 }
 
 static void
diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
index dd78830235..1478d5e581 100644
--- a/gtk/gtkplacesview.c
+++ b/gtk/gtkplacesview.c
@@ -1693,19 +1693,17 @@ _popover_set_pointing_to_widget (GtkPopover *popover,
 {
   GtkWidget *parent;
   graphene_point_t p;
-  double x, y, w, h;
+  double w, h;
 
   parent = gtk_widget_get_parent (GTK_WIDGET (popover));
 
   if (!gtk_widget_compute_point (target, parent, &GRAPHENE_POINT_INIT (0, 0), &p))
     return;
 
-  x = p.x;
-  y = p.y;
-  w = gtk_widget_get_allocated_width (GTK_WIDGET (target));
-  h = gtk_widget_get_allocated_height (GTK_WIDGET (target));
+  w = gtk_widget_get_width (target);
+  h = gtk_widget_get_height (target);
 
-  gtk_popover_set_pointing_to (popover, &(GdkRectangle){x, y, w, h});
+  gtk_popover_set_pointing_to (popover, &(GdkRectangle){p.x, p.y, w, h});
 }
 
 static gboolean
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 90d7df6ffb..f1025fc333 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -1216,8 +1216,8 @@ gtk_popover_get_gap_coords (GtkPopover *popover,
   GtkCssStyle *style;
   GtkBorder shadow_width;
 
-  popover_width = gtk_widget_get_allocated_width (widget);
-  popover_height = gtk_widget_get_allocated_height (widget);
+  popover_width = gtk_widget_get_width (widget);
+  popover_height = gtk_widget_get_height (widget);
 
   compute_surface_pointing_to (popover, &rect);
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index ed41839850..b611be086f 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -10433,6 +10433,8 @@ gtk_widget_compute_bounds (GtkWidget       *widget,
  * system [overview](coordinates.html).
  *
  * Returns: the width of the @widget
+ *
+ * Deprecated: 4.12: Use [method@Gtk.Widget.get_width] instead
  */
 int
 gtk_widget_get_allocated_width (GtkWidget *widget)
@@ -10456,6 +10458,8 @@ gtk_widget_get_allocated_width (GtkWidget *widget)
  * system [overview](coordinates.html).
  *
  * Returns: the height of the @widget
+ *
+ * Deprecated: 4.12: Use [method@Gtk.Widget.get_height] instead
  */
 int
 gtk_widget_get_allocated_height (GtkWidget *widget)
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 8ecb909135..cf6c4b2eef 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -469,9 +469,9 @@ void                  gtk_widget_set_child_visible      (GtkWidget    *widget,
 GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_get_child_visible      (GtkWidget    *widget);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_12_FOR(gtk_widget_get_width)
 int                   gtk_widget_get_allocated_width    (GtkWidget     *widget);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_12_FOR(gtk_widget_get_height)
 int                   gtk_widget_get_allocated_height   (GtkWidget     *widget);
 GDK_DEPRECATED_IN_4_12_FOR(gtk_widget_get_baseline)
 int                   gtk_widget_get_allocated_baseline (GtkWidget     *widget);