← Back to branch summary

~untrusted-ci-dev-bot/compiz/compiz-ubuntu-trusty-proposed

« back to all changes in this revision

Viewing changes to src/screen.cpp

  • Committer: CI bot
  • Author(s): Chris Townsend
  • Date: 2014-07-01 11:51:03 UTC
  • mfrom: (3860.1.21 compiz.trusty-0.9.11.1)
  • Revision ID: ps-jenkins@lists.canonical.com-20140701115103-vy93ocx7v1uly6hp
Micro-release 0.9.11.1 for 14.04 Compiz SRU1 Fixes: 347390, 1063617, 1303462, 1304531, 1305586, 1311303

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/screen.cpp
3421
3421
            if (ignore & ~modHandler->ignoredModMask ())
3422
3422
                continue;
3423
3423
 
3424
 
            /* Do not allow binding of the scroll wheel for windows other than the desktop
 
3424
            /* Do not allow binding of vertical scrolling for windows other than the desktop
3425
3425
             * unless there is a modifier defined */
3426
3426
            if (window &&
3427
3427
                !(window->type () & CompWindowTypeDesktopMask) &&
3428
 
                bind.button > 3 &&
3429
 
                bind.button < 8 &&
 
3428
                (bind.button == Button4 || bind.button == Button5) &&
3430
3429
                !mods)
3431
3430
                continue;
3432
3431