mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: enable moving and resizing of a surface when clicking on a subsurface

Browse Source 
[pq: changed to weston_surface_get_main_surface(), and used a temporary
variable to clean up the expressions.]

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Giulio Camuffo 2013-04-25 13:57:45 +03:00 committed by Kristian Høgsberg
parent 01388e253e
commit 61da3fc948
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shell.c
View File

@ -1109,10 +1109,12 @@ shell_surface_move(struct wl_client *client, struct wl_resource *resource,
{
struct weston_seat *seat = seat_resource->data;
struct shell_surface *shsurf = resource->data;
struct weston_surface *surface;
surface = weston_surface_get_main_surface(seat->pointer->focus);
if (seat->pointer->button_count == 0 ||
seat->pointer->grab_serial != serial ||
seat->pointer->focus != shsurf->surface)
surface != shsurf->surface)
return;
if (surface_move(shsurf, seat) < 0)
@ -1232,13 +1234,15 @@ shell_surface_resize(struct wl_client *client, struct wl_resource *resource,
{
struct weston_seat *seat = seat_resource->data;
struct shell_surface *shsurf = resource->data;
struct weston_surface *surface;
if (shsurf->type == SHELL_SURFACE_FULLSCREEN)
return;
surface = weston_surface_get_main_surface(seat->pointer->focus);
if (seat->pointer->button_count == 0 ||
seat->pointer->grab_serial != serial ||
seat->pointer->focus != shsurf->surface)
surface != shsurf->surface)
return;
if (surface_resize(shsurf, seat, edges) < 0)