← Back to branch summary

~severinh/unity/fixes-641669

« back to all changes in this revision

Viewing changes to unity-private/launcher/scroller-controller.vala

  • Committer: Neil Jagdish Patel
  • Date: 2010-08-02 08:24:04 UTC
  • mfrom: (410 unity)
  • mto: This revision was merged to the branch mainline in revision 413.
  • Revision ID: njpatel@pulse-20100802082404-6364t18rkwhvgqm5
[merge] trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
unity-private/launcher/scroller-controller.vala
283
283
      }
284
284
      ScrollerChild retcont = (drag_controller.get_drag_model () as ScrollerChildController).child;
285
285
 
286
 
      if (x > view.get_width () + DRAG_SAFE_ZONE)
 
286
        
 
287
      if (x > view.get_width () + DRAG_SAFE_ZONE &&
 
288
          retcont.group_type != ScrollerChild.GroupType.PLACE &&
 
289
          retcont.group_type != ScrollerChild.GroupType.SYSTEM)
287
290
        {
288
291
          // we need to remove this child from the model, its been dragged out
289
292
          model.remove (retcont);
340
343
      ScrollerChildController model_controller = drag_controller.get_drag_model () as ScrollerChildController;
341
344
      ScrollerChild retcont = model_controller.child;
342
345
 
343
 
      if (x > view.get_width ())
 
346
      if (retcont.group_type == ScrollerChild.GroupType.PLACE ||
 
347
          retcont.group_type == ScrollerChild.GroupType.SYSTEM)
 
348
        {
 
349
          ; /* Do nothing */
 
350
        }
 
351
      else if (x > view.get_width ())
344
352
        {
345
353
          // it was dropped outside of the launcher.. oh well, obliterate it.
346
354
          if (retcont.controller is ApplicationController)