blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix typos/order in tablet-v2

This commit is contained in:
Markus Ongyerth 2018-07-23 10:10:00 +02:00
parent f64962ace8
commit 3ad7b146eb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
types/tablet_v2/wlr_tablet_v2_pad.c
View File

@ -476,9 +476,9 @@ void wlr_send_tablet_v2_tablet_pad_button(
void wlr_send_tablet_v2_tablet_pad_strip(struct wlr_tablet_v2_tablet_pad *pad, void wlr_send_tablet_v2_tablet_pad_strip(struct wlr_tablet_v2_tablet_pad *pad,
uint32_t strip, double position, bool finger, uint32_t time) { uint32_t strip, double position, bool finger, uint32_t time) {
if (!pad->current_client && if (!pad->current_client ||
pad->current_client->strips && !pad->current_client->strips ||
pad->current_client->strips[strip]) { !pad->current_client->strips[strip]) {
return; return;
} }
struct wl_resource *resource = pad->current_client->strips[strip]; struct wl_resource *resource = pad->current_client->strips[strip];

2
types/tablet_v2/wlr_tablet_v2_tool.c
View File

@ -389,11 +389,11 @@ void wlr_send_tablet_v2_tablet_tool_proximity_out(
if (tool->is_down) { if (tool->is_down) {
zwp_tablet_tool_v2_send_up(tool->current_client->resource); zwp_tablet_tool_v2_send_up(tool->current_client->resource);
} }
zwp_tablet_tool_v2_send_proximity_out(tool->current_client->resource);
if (tool->current_client->frame_source) { if (tool->current_client->frame_source) {
wl_event_source_remove(tool->current_client->frame_source); wl_event_source_remove(tool->current_client->frame_source);
send_tool_frame(tool->current_client); send_tool_frame(tool->current_client);
} }
zwp_tablet_tool_v2_send_proximity_out(tool->current_client->resource);
tool->current_client = NULL; tool->current_client = NULL;
tool->focused_surface = NULL; tool->focused_surface = NULL;