Merge lp:~vanvugt/mir/fix-1454518 into lp:mir

[Daniel van Vugt]

Fix opacity controls to correctly respond to Alt+mousewheel again.
In r2564 they were accidentally changed to only respond to the scroll
wheel when a button was also held down (LP: #1454518)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2570
http://jenkins.qa.ubuntu.com/job/mir-ci/3822/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2464
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2463
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1819
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1819/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2412
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2412/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5289
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20450

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3822/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

OK.

review: Approve

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

=== modified file 'playground/demo-shell/window_manager.cpp'
--- playground/demo-shell/window_manager.cpp	2015-05-12 13:59:51 +0000
+++ playground/demo-shell/window_manager.cpp	2015-05-13 07:37:33 +0000
@@ -438,22 +438,26 @@
 
             handled = true;
         }
-        if (action == mir_pointer_action_motion && vscroll)
-        {
-            float alpha = surf->alpha();
-            alpha += 0.1f * vscroll;
-            if (alpha < 0.0f)
-                alpha = 0.0f;
-            else if (alpha > 1.0f)
-                alpha = 1.0f;
-            surf->set_alpha(alpha);
-            handled = true;
-        }
 
         old_pos = surf->top_left();
         old_size = surf->size();
     }
 
+    if (surf && 
+        (modifiers & mir_input_event_modifier_alt) &&
+        action == mir_pointer_action_motion &&
+        vscroll)
+    {
+        float alpha = surf->alpha();
+        alpha += 0.1f * vscroll;
+        if (alpha < 0.0f)
+            alpha = 0.0f;
+        else if (alpha > 1.0f)
+            alpha = 1.0f;
+        surf->set_alpha(alpha);
+        handled = true;
+    }
+
     old_cursor = cursor;
     return handled;
 }