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

x11: Stop using surface->parent

Browse Source 
It is always NULL.
This commit is contained in:
Matthias Clasen 2019-03-23 09:12:10 -04:00
parent bb1dd3f3ae
commit 6183d58f80
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gdk/x11/gdksurface-x11.c
View File

@ -858,23 +858,6 @@ _gdk_x11_display_create_surface_impl (GdkDisplay *display,
impl->override_redirect = FALSE;
/* Sanity checks */
switch (surface->surface_type)
{
case GDK_SURFACE_TOPLEVEL:
case GDK_SURFACE_TEMP:
if (surface->parent)
{
/* The common code warns for this case */
xparent = GDK_SCREEN_XROOTWIN (x11_screen);
}
break;
default:
g_assert_not_reached ();
break;
}
if (!surface->input_only)
{
class = InputOutput;
@ -932,16 +915,8 @@ _gdk_x11_display_create_surface_impl (GdkDisplay *display,
impl->unscaled_width = surface->width * impl->surface_scale;
impl->unscaled_height = surface->height * impl->surface_scale;
if (surface->parent)
{
abs_x = surface->parent->abs_x;
abs_y = surface->parent->abs_y;
}
else
{
abs_x = 0;
abs_y = 0;
}
abs_x = 0;
abs_y = 0;
impl->xid = XCreateWindow (xdisplay, xparent,
(surface->x + abs_x) * impl->surface_scale,
@ -2390,9 +2365,6 @@ gdk_x11_surface_get_frame_extents (GdkSurface *surface,
rect->width = 1;
rect->height = 1;
while (surface->parent && (surface->parent)->parent)
surface = surface->parent;
impl = GDK_SURFACE_IMPL_X11 (surface->impl);
/* Refine our fallback answer a bit using local information */