summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>2016-03-07 16:25:33 +0200
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2016-03-24 13:48:21 +0200
commitcfb053f27fcf0b2c0eadf6751bea1b716f88107e (patch)
tree93750c7ae500adcc64957c0e7133fdad0f47627f
parent13281f693ceec83c514000029c6ae1f2439baa10 (diff)
ivi-shell: add input panel label func
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>
-rw-r--r--ivi-shell/input-panel-ivi.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/ivi-shell/input-panel-ivi.c b/ivi-shell/input-panel-ivi.c
index 721d31c8..581b56bc 100644
--- a/ivi-shell/input-panel-ivi.c
+++ b/ivi-shell/input-panel-ivi.c
@@ -157,6 +157,12 @@ update_input_panels(struct wl_listener *listener, void *data)
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
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);
input_panel_surface->surface->configure = NULL;
+ weston_surface_set_label_func(input_panel_surface->surface, NULL);
weston_view_destroy(input_panel_surface->view);
free(input_panel_surface);
@@ -235,6 +242,7 @@ create_input_panel_surface(struct ivi_shell *shell,
surface->configure = input_panel_configure;
surface->configure_private = input_panel_surface;
+ weston_surface_set_label_func(surface, input_panel_get_label);
input_panel_surface->shell = shell;