Skip to content

wayland: Return correct value when handling show-option-menu #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aperezdc merged 1 commit into from
Apr 29, 2026
Merged

wayland: Return correct value when handling show-option-menu #786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions platform/wayland/cog-view-wl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ static void on_mouse_target_changed(WebKitWebView *, WebKitHitTestResult *hitTes
#if COG_HAVE_LIBPORTAL
static void on_run_file_chooser(WebKitWebView *, WebKitFileChooserRequest *);
#endif
static void on_show_option_menu(WebKitWebView *, WebKitOptionMenu *, WebKitRectangle *, gpointer *);
static void on_wl_surface_frame(void *, struct wl_callback *, uint32_t);
static gboolean on_show_option_menu(WebKitWebView *, WebKitOptionMenu *, WebKitRectangle *, gpointer *);
static void on_wl_surface_frame(void *, struct wl_callback *, uint32_t);

static void shm_buffer_copy_contents(struct shm_buffer *, struct wl_shm_buffer *);
static struct shm_buffer *shm_buffer_create(CogWlView *, struct wl_resource *, size_t);
Expand Down Expand Up @@ -516,14 +516,15 @@ on_run_file_chooser(WebKitWebView *view, WebKitFileChooserRequest *request)
}
#endif /* COG_HAVE_LIBPORTAL */

static void
static gboolean
on_show_option_menu(WebKitWebView *view, WebKitOptionMenu *menu, WebKitRectangle *rectangle, gpointer *data)
{
g_autoptr(CogWlViewport) viewport = COG_WL_VIEWPORT(cog_view_get_viewport((CogView *) view));
if (!viewport)
return;
return FALSE;

cog_wl_platform_popup_create(viewport, g_object_ref(menu));
return TRUE;
}

static void
Expand Down
Loading