AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

widget: Use gtk_widget_get_native() in get_surface_allocation()

Browse Source
This commit is contained in:
Timm Bäder 2020-12-31 08:02:10 +01:00
parent 4a1a7940d5
commit 06cce81a97
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkwidget.c
View File

@ -3425,21 +3425,18 @@ void
gtk_widget_get_surface_allocation (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkWidget *parent;
GtkNative *native;
graphene_rect_t bounds;
double nx, ny;
/* Don't consider the parent == widget case here. */
parent = _gtk_widget_get_parent (widget);
while (parent && !GTK_IS_NATIVE (parent))
parent = _gtk_widget_get_parent (parent);
native = gtk_widget_get_native (widget);
g_assert (GTK_IS_WINDOW (parent) || GTK_IS_POPOVER (parent));
gtk_native_get_surface_transform (GTK_NATIVE (parent), &nx, &ny);
g_assert (GTK_IS_WINDOW (native) || GTK_IS_POPOVER (native));
gtk_native_get_surface_transform (native, &nx, &ny);
if (gtk_widget_compute_bounds (widget, parent, &bounds))
if (gtk_widget_compute_bounds (widget, GTK_WIDGET (native), &bounds))
{
*allocation = (GtkAllocation){
*allocation = (GtkAllocation) {
floorf (bounds.origin.x) + nx,
floorf (bounds.origin.y) + ny,
ceilf (bounds.size.width),