AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-19 13:30:02 +00:00
Code Issues Projects Releases Wiki Activity

Stop using gtk_widget_get_allocated_baseline

Browse Source 
Use gtk_widget_get_baseline instead.
This commit is contained in:
Matthias Clasen 2023-04-28 15:25:09 -04:00
parent 3ea289751d
commit b201d66981
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkgridlayout.c
View File

@ -1162,7 +1162,7 @@ grid_request_allocate (GridRequest *request,
lines = &request->lines[orientation];
spacing = get_spacing (request->layout, request->widget, orientation);
baseline = gtk_widget_get_allocated_baseline (request->widget);
baseline = gtk_widget_get_baseline (request->widget);
if (orientation == GTK_ORIENTATION_VERTICAL && baseline != -1 &&
self->baseline_row >= lines->min && self->baseline_row < lines->max &&
@ -1298,7 +1298,7 @@ grid_request_position (GridRequest *request,
lines = &request->lines[orientation];
spacing = get_spacing (request->layout, request->widget, orientation);
allocated_baseline = gtk_widget_get_allocated_baseline (request->widget);
allocated_baseline = gtk_widget_get_baseline (request->widget);
position = 0;
for (i = 0; i < lines->max - lines->min; i++)

2
gtk/gtkimage.c
View File

@ -1014,7 +1014,7 @@ gtk_image_snapshot (GtkWidget *widget,
x = (width - ceil (w)) / 2;
baseline = gtk_widget_get_allocated_baseline (widget);
baseline = gtk_widget_get_baseline (widget);
if (baseline == -1)
y = floor(height - ceil (h)) / 2;
else

2
gtk/gtkinscription.c
View File

@ -432,7 +432,7 @@ gtk_inscription_get_layout_location (GtkInscription *self,
else
x = floor ((xalign * (widget_width - logical.width)) - logical.x);
baseline = gtk_widget_get_allocated_baseline (widget);
baseline = gtk_widget_get_baseline (widget);
if (baseline != -1)
{
int layout_baseline = pango_layout_get_baseline (self->layout) / PANGO_SCALE;

2
gtk/gtklabel.c
View File

@ -1335,7 +1335,7 @@ get_layout_location (GtkLabel *self,
pango_layout_get_pixel_extents (self->layout, NULL, &logical);
x = floor ((xalign * (widget_width - logical.width)) - logical.x);
baseline = gtk_widget_get_allocated_baseline (widget);
baseline = gtk_widget_get_baseline (widget);
if (baseline != -1)
{
int layout_baseline = pango_layout_get_baseline (self->layout) / PANGO_SCALE;

2
gtk/inspector/baselineoverlay.c
View File

@ -36,7 +36,7 @@ recurse_child_widgets (GtkWidget *widget,
gtk_snapshot_push_rounded_clip (snapshot, gtk_css_boxes_get_padding_box (&boxes));
}
baseline = gtk_widget_get_allocated_baseline (widget);
baseline = gtk_widget_get_baseline (widget);
if (baseline != -1)
{

2
gtk/inspector/misc-info.c
View File

@ -160,7 +160,7 @@ update_allocation (GtkWidget *w,
gtk_label_set_label (GTK_LABEL (sl->bounds), size_label);
g_free (size_label);
size_label = g_strdup_printf ("%d", gtk_widget_get_allocated_baseline (w));
size_label = g_strdup_printf ("%d", gtk_widget_get_baseline (w));
gtk_label_set_label (GTK_LABEL (sl->baseline), size_label);
g_free (size_label);

2
tests/testbaseline2.c
View File

@ -131,7 +131,7 @@ baseline_widget_snapshot (GtkWidget *widget,
GskRoundedRect outline;
height = gtk_widget_get_height (widget);
baseline = gtk_widget_get_allocated_baseline (widget);
baseline = gtk_widget_get_baseline (widget);
gtk_snapshot_save (snapshot);