summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/gtk-demo/dnd.c14
-rw-r--r--demos/gtk-demo/fontplane.c12
-rw-r--r--demos/gtk-demo/suggestionentry.c2
-rw-r--r--gtk/gtkcolumnview.c2
-rw-r--r--gtk/gtkplacessidebar.c10
-rw-r--r--gtk/gtkplacesview.c10
-rw-r--r--gtk/gtkpopover.c4
-rw-r--r--gtk/gtkwidget.c4
-rw-r--r--gtk/gtkwidget.h4
-rw-r--r--tests/testzoom.c8
10 files changed, 40 insertions, 30 deletions
diff --git a/demos/gtk-demo/dnd.c b/demos/gtk-demo/dnd.c
index 086836f16a..2373a71f12 100644
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -109,15 +109,21 @@ static void
apply_transform (CanvasItem *item)
{
GskTransform *transform;
+ graphene_rect_t bounds;
double x, y;
- x = gtk_widget_get_allocated_width (item->label) / 2.0;
- y = gtk_widget_get_allocated_height (item->label) / 2.0;
- item->r = sqrt (x*x + y*y);
+ /* Add css padding and margin */
+ if (!gtk_widget_compute_bounds (item->label, item->label, &bounds))
+ return;
+
+ x = bounds.size.width / 2.;
+ y = bounds.size.height / 2.;
+
+ item->r = sqrt (x * x + y * y);
transform = gsk_transform_translate (NULL, &(graphene_point_t) { item->r, item->r });
transform = gsk_transform_rotate (transform, item->angle + item->delta);
- transform = gsk_transform_translate (transform, &(graphene_point_t) { -x, -y });
+ transform = gsk_transform_translate (transform, &GRAPHENE_POINT_INIT (-x, -y));
gtk_fixed_set_child_transform (GTK_FIXED (item->fixed), item->label, transform);
gsk_transform_unref (transform);
diff --git a/demos/gtk-demo/fontplane.c b/demos/gtk-demo/fontplane.c
index b8c4f8c87d..038ae68f58 100644
--- a/demos/gtk-demo/fontplane.c
+++ b/demos/gtk-demo/fontplane.c
@@ -42,8 +42,8 @@ val_to_xy (GtkFontPlane *plane,
double u, v;
int width, height;
- width = gtk_widget_get_allocated_width (GTK_WIDGET (plane));
- height = gtk_widget_get_allocated_height (GTK_WIDGET (plane));
+ width = gtk_widget_get_width (GTK_WIDGET (plane));
+ height = gtk_widget_get_height (GTK_WIDGET (plane));
u = adjustment_get_normalized_value (plane->width_adj);
v = adjustment_get_normalized_value (plane->weight_adj);
@@ -62,8 +62,8 @@ plane_snapshot (GtkWidget *widget,
cairo_t *cr;
val_to_xy (plane, &x, &y);
- width = gtk_widget_get_allocated_width (widget);
- height = gtk_widget_get_allocated_height (widget);
+ width = gtk_widget_get_width (widget);
+ height = gtk_widget_get_height (widget);
cr = gtk_snapshot_append_cairo (snapshot,
&GRAPHENE_RECT_INIT (0, 0, width, height));
@@ -131,8 +131,8 @@ update_value (GtkFontPlane *plane,
GtkWidget *widget = GTK_WIDGET (plane);
double u, v;
- u = CLAMP (x * (1.0 / gtk_widget_get_allocated_width (widget)), 0, 1);
- v = CLAMP (1 - y * (1.0 / gtk_widget_get_allocated_height (widget)), 0, 1);
+ u = CLAMP (x * (1.0 / gtk_widget_get_width (widget)), 0, 1);
+ v = CLAMP (1 - y * (1.0 / gtk_widget_get_height (widget)), 0, 1);
adjustment_set_normalized_value (plane->width_adj, u);
adjustment_set_normalized_value (plane->weight_adj, v);
diff --git a/demos/gtk-demo/suggestionentry.c b/demos/gtk-demo/suggestionentry.c
index f8a28c8375..d4dd418f20 100644
--- a/demos/gtk-demo/suggestionentry.c
+++ b/demos/gtk-demo/suggestionentry.c
@@ -471,7 +471,7 @@ suggestion_entry_size_allocate (GtkWidget *widget,
&(GtkAllocation) { width - arrow_nat, 0, arrow_nat, height },
baseline);
- gtk_widget_set_size_request (self->popup, gtk_widget_get_allocated_width (GTK_WIDGET (self)), -1);
+ gtk_widget_set_size_request (self->popup, gtk_widget_get_width (GTK_WIDGET (self)), -1);
gtk_widget_queue_resize (self->popup);
gtk_popover_present (GTK_POPOVER (self->popup));
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);
diff --git a/tests/testzoom.c b/tests/testzoom.c
index f41dbee9b7..b750f2e6ee 100644
--- a/tests/testzoom.c
+++ b/tests/testzoom.c
@@ -51,6 +51,7 @@ update_transform (GtkZoom *zoom)
GtkLayoutManager *manager;
GtkLayoutChild *child;
GskTransform *transform;
+ graphene_rect_t bounds;
int w, h;
int x, y;
@@ -60,8 +61,11 @@ update_transform (GtkZoom *zoom)
w = gtk_widget_get_width (GTK_WIDGET (zoom));
h = gtk_widget_get_height (GTK_WIDGET (zoom));
- x = gtk_widget_get_allocated_width (GTK_WIDGET (zoom->child));
- y = gtk_widget_get_allocated_height (GTK_WIDGET (zoom->child));
+ if (!gtk_widget_compute_bounds (GTK_WIDGET (zoom->child), GTK_WIDGET (zoom->child), &bounds))
+ return;
+
+ x = bounds.size.width;
+ y = bounds.size.height;
transform = NULL;
transform = gsk_transform_translate (transform, &GRAPHENE_POINT_INIT (w/2, h/2));
View Lorry Controller Status