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

ivi-shell: add input panel label func

Browse Source 
Copied from desktop-shell/input-panel.c, add a label function for the
input panel.

This patch strictly reduces the difference between input-panel.c and
input-panel-ivi.c.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Eugen Friedrich <friedrix@gmail.com>
This commit is contained in:
Pekka Paalanen
2016-03-07 16:25:33 +02:00
parent 13281f693c
commit cfb053f27f
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ivi-shell/input-panel-ivi.c
+8
View File
@@ -157,6 +157,12 @@ update_input_panels(struct wl_listener *listener, void *data)
memcpy(&shell->text_input.cursor_rectangle, data, sizeof(pixman_box32_t)); memcpy(&shell->text_input.cursor_rectangle, data, sizeof(pixman_box32_t));
} }
static int
input_panel_get_label(struct weston_surface *surface, char *buf, size_t len)
{
return snprintf(buf, len, "input panel");
}
static void static void
input_panel_configure(struct weston_surface *surface, int32_t sx, int32_t sy) input_panel_configure(struct weston_surface *surface, int32_t sx, int32_t sy)
{ {
@@ -194,6 +200,7 @@ destroy_input_panel_surface(struct input_panel_surface *input_panel_surface)
wl_list_remove(&input_panel_surface->link); wl_list_remove(&input_panel_surface->link);
input_panel_surface->surface->configure = NULL; input_panel_surface->surface->configure = NULL;
weston_surface_set_label_func(input_panel_surface->surface, NULL);
weston_view_destroy(input_panel_surface->view); weston_view_destroy(input_panel_surface->view);
free(input_panel_surface); free(input_panel_surface);
@@ -235,6 +242,7 @@ create_input_panel_surface(struct ivi_shell *shell,
surface->configure = input_panel_configure; surface->configure = input_panel_configure;
surface->configure_private = input_panel_surface; surface->configure_private = input_panel_surface;
weston_surface_set_label_func(surface, input_panel_get_label);
input_panel_surface->shell = shell; input_panel_surface->shell = shell;