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

shell: Update relevant bits to work with recent alpha value changes.

Browse Source
This commit is contained in:
Scott Moreau
2012-05-22 01:54:10 -06:00
committed by Kristian Høgsberg
parent 1042dc15e0
commit 02709afb51
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shell.c
+5 -5
View File
@@ -1598,7 +1598,7 @@ surface_opacity_binding(struct wl_seat *seat, uint32_t time,
uint32_t key, uint32_t button, uint32_t axis, uint32_t key, uint32_t button, uint32_t axis,
int32_t value, void *data) int32_t value, void *data)
{ {
uint32_t step = 15; float step = 0.05;
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;
@@ -1620,8 +1620,8 @@ surface_opacity_binding(struct wl_seat *seat, uint32_t time,
surface->alpha += value * step; surface->alpha += value * step;
if (surface->alpha > 255) if (surface->alpha > 1.0)
surface->alpha = 255; surface->alpha = 1.0;
if (surface->alpha < step) if (surface->alpha < step)
surface->alpha = step; surface->alpha = step;
@@ -2371,7 +2371,7 @@ switcher_next(struct switcher *switcher)
if (prev == switcher->current) if (prev == switcher->current)
next = surface; next = surface;
prev = surface; prev = surface;
surface->alpha = 64; surface->alpha = 0.25;
surface->geometry.dirty = 1; surface->geometry.dirty = 1;
weston_surface_damage(surface); weston_surface_damage(surface);
break; break;
@@ -2380,7 +2380,7 @@ switcher_next(struct switcher *switcher)
} }
if (is_black_surface(surface, NULL)) { if (is_black_surface(surface, NULL)) {
surface->alpha = 64; surface->alpha = 0.25;
surface->geometry.dirty = 1; surface->geometry.dirty = 1;
weston_surface_damage(surface); weston_surface_damage(surface);
} }