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

Merge pull request #891 from agx/layer-shell-popup-grab 

examples/layer-shell: take grab on the popup
This commit is contained in:
Drew DeVault 2018-04-23 18:21:51 +02:00 committed by GitHub
parent e2ed7be0ba 67a10cc1f6
commit c0831344aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/layer-shell.c
View File

@ -209,7 +209,7 @@ static const struct xdg_popup_listener xdg_popup_listener = {
.popup_done = xdg_popup_done, .popup_done = xdg_popup_done,
}; };
static void create_popup() { static void create_popup(uint32_t serial) {
if (popup) { if (popup) {
return; return;
} }
@ -227,6 +227,8 @@ static void create_popup() {
xdg_positioner_set_anchor(xdg_positioner, XDG_POSITIONER_ANCHOR_BOTTOM_RIGHT); xdg_positioner_set_anchor(xdg_positioner, XDG_POSITIONER_ANCHOR_BOTTOM_RIGHT);
popup = xdg_surface_get_popup(xdg_surface, NULL, xdg_positioner); popup = xdg_surface_get_popup(xdg_surface, NULL, xdg_positioner);
xdg_popup_grab(popup, seat, serial);
assert(popup); assert(popup);
zwlr_layer_surface_v1_get_popup(layer_surface, popup); zwlr_layer_surface_v1_get_popup(layer_surface, popup);
@ -311,7 +313,7 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
if (popup_wl_surface) { if (popup_wl_surface) {
popup_destroy(); popup_destroy();
} else { } else {
create_popup(); create_popup(serial);
} }
} else { } else {
buttons++; buttons++;