Skip to content

Commit 339f268

Browse files
committed
Cherry picked some of the patch from Djdeath, clutter-project#79 upstream
1 parent 2fe7cdc commit 339f268

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

mx/wayland/mx-window-wayland.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ clutter_stage_wayland_get_shell_surface (ClutterStage *stage);
102102
struct wl_input_device *
103103
clutter_input_device_wayland_get_input_device (ClutterInputDevice *device);
104104

105-
106105
static gboolean
107106
_resize_grip_button_press_event_cb (ClutterActor *actor,
108107
ClutterEvent *event,
@@ -111,14 +110,13 @@ _resize_grip_button_press_event_cb (ClutterActor *actor,
111110
MxWindowWaylandPrivate *priv = window->priv;
112111
ClutterStage *stage = mx_window_get_clutter_stage (priv->window);
113112
struct wl_shell_surface *shell_surface;
114-
struct wl_input_device *input_device;
113+
struct wl_seat *seat;
115114

116115
shell_surface = clutter_wayland_stage_get_wl_shell_surface (stage);
117-
input_device =
118-
clutter_wayland_input_device_get_wl_input_device (event->button.device);
116+
seat = clutter_wayland_input_device_get_wl_seat (event->button.device);
119117

120118
wl_shell_surface_resize (shell_surface,
121-
input_device,
119+
seat,
122120
event->button.time,
123121
WL_SHELL_SURFACE_RESIZE_BOTTOM_RIGHT);
124122

@@ -133,13 +131,12 @@ _toolbar_button_press_event_cb (ClutterActor *actor,
133131
MxWindowWaylandPrivate *priv = window->priv;
134132
ClutterStage *stage = mx_window_get_clutter_stage (priv->window);
135133
struct wl_shell_surface *shell_surface;
136-
struct wl_input_device *input_device;
134+
struct wl_seat *seat;
137135

138136
shell_surface = clutter_wayland_stage_get_wl_shell_surface (stage);
139-
input_device =
140-
clutter_wayland_input_device_get_wl_input_device (event->button.device);
137+
seat = clutter_wayland_input_device_get_wl_seat (event->button.device);
141138

142-
wl_shell_surface_move (shell_surface, input_device, event->button.time);
139+
wl_shell_surface_move (shell_surface, seat, event->button.time);
143140

144141
return FALSE;
145142
}

0 commit comments

Comments
 (0)