[mutter/wayland] wayland: Fix compile error



commit cc13f8f65e30d78751d8b3c215873327fcb96763
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Feb 18 19:01:50 2014 -0500

    wayland: Fix compile error
    
    I tested this with meta_window_get_input_rect and decided to change
    it at the last minute. Turns out meta_window_get_rect is unlike all
    the others. Just access window->rect directly instead.

 src/wayland/meta-wayland-surface.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 2638aa0..62b7d92 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -1015,13 +1015,10 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
   MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
   MetaWaylandSurface *parent_surf = wl_resource_get_user_data (parent_resource);
   MetaWaylandSeat *seat = wl_resource_get_user_data (seat_resource);
-  MetaRectangle parent_rect;
 
   if (parent_surf == NULL || parent_surf->window == NULL)
     return;
 
-  meta_window_get_rect (parent_surf->window, &parent_rect);
-
   if (!create_surface_extension (&surface->xdg_popup, client, surface_resource, resource, id,
                                  META_XDG_POPUP_VERSION,
                                  &xdg_popup_interface,
@@ -1035,8 +1032,8 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
     }
 
   surface->window = meta_window_wayland_new (meta_get_display (), surface);
-  surface->window->rect.x = parent_rect.x + x;
-  surface->window->rect.y = parent_rect.y + y;
+  surface->window->rect.x = parent_surf->window->rect.x + x;
+  surface->window->rect.y = parent_surf->window->rect.y + y;
   surface->window->showing_for_first_time = FALSE;
   surface->window->placed = TRUE;
   meta_window_set_transient_for (surface->window, parent_surf->window);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]