cairo-util: return theme location from frame_touch_down
I'll be using this in a follow up patch that adds touch input to weston's
wayland backend.
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
diff --git a/shared/frame.c b/shared/frame.c
index 4179b0a..1b67eb1 100644
--- a/shared/frame.c
+++ b/shared/frame.c
@@ -786,27 +786,27 @@
return location;
}
-void
+enum theme_location
frame_touch_down(struct frame *frame, void *data, int32_t id, int x, int y)
{
struct frame_touch *touch = frame_touch_get(frame, data);
struct frame_button *button = frame_find_button(frame, x, y);
enum theme_location location;
- if (id > 0)
- return;
-
- if (touch && button) {
- touch->button = button;
- frame_button_press(touch->button);
- return;
- }
-
location = theme_get_location(frame->theme, x, y,
frame->width, frame->height,
frame->flags & FRAME_FLAG_MAXIMIZED ?
THEME_FRAME_MAXIMIZED : 0);
+ if (id > 0)
+ return location;
+
+ if (touch && button) {
+ touch->button = button;
+ frame_button_press(touch->button);
+ return location;
+ }
+
switch (location) {
case THEME_LOCATION_TITLEBAR:
frame->status |= FRAME_STATUS_MOVE;
@@ -824,6 +824,7 @@
default:
break;
}
+ return location;
}
void