[weston,1/6] xdg-shell: Take a xdg_surface as the parent surface

Submitted by Jasper St. Pierre on Nov. 22, 2014, 8:28 p.m.

Details

Message ID 1416688110-21188-2-git-send-email-jstpierre@mecheye.net
State Superseded
Headers show

Not browsing as part of any series.

Commit Message

Jasper St. Pierre Nov. 22, 2014, 8:28 p.m.
There is no other valid surface that we should be using here.
---
 clients/window.c       | 4 ++--
 protocol/xdg-shell.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/clients/window.c b/clients/window.c
index 5099004..5f86db2 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -4008,13 +4008,13 @@  static const struct xdg_surface_listener xdg_surface_listener = {
 static void
 window_sync_parent(struct window *window)
 {
-	struct wl_surface *parent_surface;
+	struct xdg_surface *parent_surface;
 
 	if (!window->xdg_surface)
 		return;
 
 	if (window->parent)
-		parent_surface = window->parent->main_surface->surface;
+		parent_surface = window->parent->xdg_surface;
 	else
 		parent_surface = NULL;
 
diff --git a/protocol/xdg-shell.xml b/protocol/xdg-shell.xml
index 776438b..6abfabd 100644
--- a/protocol/xdg-shell.xml
+++ b/protocol/xdg-shell.xml
@@ -152,7 +152,7 @@ 
 	unmapped if the parent is unmapped too. They should not appear
 	on task bars and alt+tab.
       </description>
-      <arg name="parent" type="object" interface="wl_surface" allow-null="true"/>
+      <arg name="parent" type="object" interface="xdg_surface" allow-null="true"/>
     </request>
 
     <request name="set_title">