← Back to branch summary

~townsend/unity/fix-dash-page-up-down

« back to all changes in this revision

Viewing changes to launcher/EdgeBarrierController.cpp

  • Committer: Daniel van Vugt
  • Date: 2012-09-13 10:56:42 UTC
  • mfrom: (2684 unity)
  • mto: This revision was merged to the branch mainline in revision 2698.
  • Revision ID: daniel.van.vugt@canonical.com-20120913105642-9on2ald55h54j1zn
Merge latest lp:unity and fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/EdgeBarrierController.cpp
155
155
 
156
156
void EdgeBarrierController::Impl::OnPointerBarrierEvent(PointerBarrierWrapper* owner, BarrierEvent::Ptr event)
157
157
{
 
158
  if (owner->released)
 
159
  {
 
160
    BarrierRelease(owner, event->event_id);
 
161
    return;
 
162
  }
 
163
 
158
164
  unsigned int monitor = owner->index;
159
165
  bool process = true;
160
166
 
166
172
      process = false;
167
173
  }
168
174
 
169
 
  if (process && owner->released)
170
 
  {
171
 
    BarrierRelease(owner, event->event_id);
172
 
  }
173
 
  else if (process && owner->x1 > 0)
 
175
  if (process && owner->x1 > 0)
174
176
  {
175
177
    decaymulator_.value = decaymulator_.value + event->velocity;
176
178