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

shell: Update bindings to conform to pointer axis protocol

Browse Source 
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
This commit is contained in:
Jonas Ådahl
2012-09-27 18:40:42 +02:00
committed by Kristian Høgsberg
parent 62efe20cb9
commit b0b87baf7c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shell.c
+6 -4
View File
@@ -1866,9 +1866,10 @@ shell_map_popup(struct shell_surface *shsurf)
} }
wl_list_insert(es->geometry.transformation_list.prev, wl_list_insert(es->geometry.transformation_list.prev,
&shsurf->popup.parent_transform.link); &shsurf->popup.parent_transform.link);
weston_surface_set_position(es, shsurf->popup.x, shsurf->popup.y);
shsurf->popup.initial_up = 0; shsurf->popup.initial_up = 0;
weston_surface_set_position(es, shsurf->popup.x, shsurf->popup.y);
weston_surface_update_transform(es);
/* We don't require the grab to still be active, but if another /* We don't require the grab to still be active, but if another
* grab has started in the meantime, we end the popup now. */ * grab has started in the meantime, we end the popup now. */
@@ -2367,7 +2368,7 @@ static void
surface_opacity_binding(struct wl_seat *seat, uint32_t time, uint32_t axis, surface_opacity_binding(struct wl_seat *seat, uint32_t time, uint32_t axis,
wl_fixed_t value, void *data) wl_fixed_t value, void *data)
{ {
float step = 0.05; float step = 0.005;
struct shell_surface *shsurf; struct shell_surface *shsurf;
struct weston_surface *surface = struct weston_surface *surface =
(struct weston_surface *) seat->pointer->focus; (struct weston_surface *) seat->pointer->focus;
@@ -2379,7 +2380,7 @@ surface_opacity_binding(struct wl_seat *seat, uint32_t time, uint32_t axis,
if (!shsurf) if (!shsurf)
return; return;
surface->alpha += wl_fixed_to_double(value) * step; surface->alpha -= wl_fixed_to_double(value) * step;
if (surface->alpha > 1.0) if (surface->alpha > 1.0)
surface->alpha = 1.0; surface->alpha = 1.0;
@@ -2409,8 +2410,9 @@ do_zoom(struct wl_seat *seat, uint32_t time, uint32_t key, uint32_t axis,
else if (key == KEY_PAGEDOWN) else if (key == KEY_PAGEDOWN)
increment = -output->zoom.increment; increment = -output->zoom.increment;
else if (axis == WL_POINTER_AXIS_VERTICAL_SCROLL) else if (axis == WL_POINTER_AXIS_VERTICAL_SCROLL)
/* For every pixel zoom 20th of a step */
increment = output->zoom.increment * increment = output->zoom.increment *
wl_fixed_to_double(value); -wl_fixed_to_double(value) / 20.0;
else else
increment = 0; increment = 0;