← Back to branch summary

~om26er/ubuntu/oneiric/nux/sru-819721

« back to all changes in this revision

Viewing changes to Nux/WindowCompositor.cpp

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2011-09-26 12:31:59 UTC
  • mfrom: (1.1.31 upstream)
  • Revision ID: package-import@ubuntu.com-20110926123159-klfno1cr8s5hjmad
Tags: 1.12.0-0ubuntu1
https://launchpad.net/bugs/785118
* New upstream release.
  - valgrind: Mismatched free in libnux (LP: #785118)
  - other misc rendering optimizations

Show diffs side-by-side

added added

removed removed

Lines of Context:
Nux/WindowCompositor.cpp
433
433
            event.e_event = NUX_MOUSE_PRESSED;
434
434
          }
435
435
 
 
436
          bool emit_double_click_signal = false;
436
437
          if (mouse_over_area_ && (hit_view != mouse_over_area_))
437
438
          {
438
439
            // The area where the mouse was in the previous cycle and the area returned by GetAreaUnderMouse are different.
446
447
 
447
448
            mouse_over_area_->EmitMouseLeaveSignal(x, y, event.GetMouseState(), event.GetKeyState());
448
449
          }
 
450
          else if (mouse_over_area_ && (hit_view == mouse_over_area_) && (event.e_event == NUX_MOUSE_DOUBLECLICK))
 
451
          {
 
452
            emit_double_click_signal = true;
 
453
          }
449
454
 
450
455
          SetMouseOverArea(hit_view);
451
456
          SetMouseOwnerArea(hit_view);
474
479
            }
475
480
          }
476
481
 
477
 
          mouse_over_area_->EmitMouseDownSignal(hit_view_x, hit_view_y, event.GetMouseState(), event.GetKeyState());
 
482
          if (emit_double_click_signal)
 
483
          {
 
484
            mouse_over_area_->EmitMouseDoubleClickSignal(hit_view_x, hit_view_y, event.GetMouseState(), event.GetKeyState());
 
485
          }
 
486
          else
 
487
          {
 
488
            mouse_over_area_->EmitMouseDownSignal(hit_view_x, hit_view_y, event.GetMouseState(), event.GetKeyState());
 
489
          }
478
490
        }
479
491
        else if (hit_view && (event.e_event == NUX_MOUSE_WHEEL))
480
492
        {