callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: set_transient_for was renamed to set_parent

Browse Source
This commit is contained in:
Jasper St. Pierre
2014-04-11 16:55:37 -07:00
parent e91e447db7
commit eb5cc3da9b
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gdk/wayland/gdkwindow-wayland.c
View File

@ -638,10 +638,10 @@ gdk_wayland_window_set_user_time (GdkWindow *window,
} }
static void static void
gdk_wayland_window_sync_transient_for (GdkWindow *window) gdk_wayland_window_sync_parent (GdkWindow *window)
{ {
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
struct wl_surface *transient_for_surface; struct wl_surface *parent_surface;
if (!impl->xdg_surface) if (!impl->xdg_surface)
return; return;
@ -654,12 +654,12 @@ gdk_wayland_window_sync_transient_for (GdkWindow *window)
if (!impl_parent->surface) if (!impl_parent->surface)
return; return;
transient_for_surface = impl_parent->surface; parent_surface = impl_parent->surface;
} }
else else
transient_for_surface = NULL; parent_surface = NULL;
xdg_surface_set_transient_for (impl->xdg_surface, transient_for_surface); xdg_surface_set_parent (impl->xdg_surface, parent_surface);
} }
static void static void
@ -894,7 +894,7 @@ gdk_wayland_window_create_xdg_surface (GdkWindow *window)
impl->xdg_surface = xdg_shell_get_xdg_surface (display_wayland->xdg_shell, impl->surface); impl->xdg_surface = xdg_shell_get_xdg_surface (display_wayland->xdg_shell, impl->surface);
xdg_surface_add_listener (impl->xdg_surface, &xdg_surface_listener, window); xdg_surface_add_listener (impl->xdg_surface, &xdg_surface_listener, window);
gdk_wayland_window_sync_transient_for (window); gdk_wayland_window_sync_parent (window);
gdk_wayland_window_sync_title (window); gdk_wayland_window_sync_title (window);
gdk_wayland_window_sync_margin (window); gdk_wayland_window_sync_margin (window);
xdg_surface_set_app_id (impl->xdg_surface, gdk_get_program_class ()); xdg_surface_set_app_id (impl->xdg_surface, gdk_get_program_class ());
@ -1516,7 +1516,7 @@ gdk_wayland_window_set_transient_for (GdkWindow *window,
impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
impl->transient_for = parent; impl->transient_for = parent;
gdk_wayland_window_sync_transient_for (window); gdk_wayland_window_sync_parent (window);
} }
static void static void

5
gdk/wayland/protocol/xdg-shell.xml
View File

@ -137,11 +137,8 @@
</description> </description>
</request> </request>
<request name="set_transient_for"> <request name="set_parent">
<description summary="surface is a child of another surface"> <description summary="surface is a child of another surface">
Setting a surface as transient of another means that it is child
of another surface.
Child surfaces are stacked above their parents, and will be Child surfaces are stacked above their parents, and will be
unmapped if the parent is unmapped too. They should not appear unmapped if the parent is unmapped too. They should not appear
on task bars and alt+tab. on task bars and alt+tab.