brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Remove edges

Browse Source 
This is an upstream change to xdg-shell.
This commit is contained in:
Jasper St. Pierre 2014-02-07 17:23:17 -05:00
parent d694260ad2
commit 912a0abd26
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
protocol/xdg-shell.xml
View File

@ -230,7 +230,6 @@
in surface local coordinates. in surface local coordinates.
</description> </description>
<arg name="edges" type="uint"/>
<arg name="width" type="int"/> <arg name="width" type="int"/>
<arg name="height" type="int"/> <arg name="height" type="int"/>
</event> </event>

4
src/core/window.c
View File

@ -4741,9 +4741,7 @@ meta_window_move_resize_internal (MetaWindow *window,
need_resize_client = TRUE; need_resize_client = TRUE;
meta_wayland_surface_configure_notify (window->surface, meta_wayland_surface_configure_notify (window->surface,
new_rect.width, new_rect.width,
new_rect.height, new_rect.height);
(dx != 0 ? WL_SHELL_SURFACE_RESIZE_LEFT : 0) |
(dy != 0 ? WL_SHELL_SURFACE_RESIZE_TOP : 0));
} }
else else
{ {

5
src/wayland/meta-wayland-surface.c
View File

@ -1434,12 +1434,11 @@ meta_wayland_init_shell (MetaWaylandCompositor *compositor)
void void
meta_wayland_surface_configure_notify (MetaWaylandSurface *surface, meta_wayland_surface_configure_notify (MetaWaylandSurface *surface,
int new_width, int new_width,
int new_height, int new_height)
int edges)
{ {
if (surface->xdg_surface.resource) if (surface->xdg_surface.resource)
xdg_surface_send_configure (surface->xdg_surface.resource, xdg_surface_send_configure (surface->xdg_surface.resource,
edges, new_width, new_height); new_width, new_height);
} }
void void

3
src/wayland/meta-wayland-surface.h
View File

@ -108,8 +108,7 @@ MetaWaylandSurface *meta_wayland_surface_create (MetaWaylandCompositor *composit
guint32 version); guint32 version);
void meta_wayland_surface_configure_notify (MetaWaylandSurface *surface, void meta_wayland_surface_configure_notify (MetaWaylandSurface *surface,
int width, int width,
int height, int height);
int edges);
void meta_wayland_surface_focused_set (MetaWaylandSurface *surface); void meta_wayland_surface_focused_set (MetaWaylandSurface *surface);
void meta_wayland_surface_focused_unset (MetaWaylandSurface *surface); void meta_wayland_surface_focused_unset (MetaWaylandSurface *surface);