← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to dash/DashView.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:
dash/DashView.cpp
407
407
 
408
408
  if (IsFullRedraw())
409
409
    nux::GetPainter().PushBackgroundStack();
410
 
  
 
410
 
411
411
  if (preview_displaying_)
412
412
   preview_container_->ProcessDraw(gfx_context, (!force_draw) ? IsFullRedraw() : force_draw);
413
413
  else
414
414
    layout_->ProcessDraw(gfx_context, force_draw);
415
 
    
 
415
 
416
416
  if (IsFullRedraw())
417
417
    nux::GetPainter().PopBackgroundStack();
418
418
 
419
419
  renderer_.DrawInnerCleanup(gfx_context, content_geo_, GetAbsoluteGeometry(), GetGeometry());
420
420
}
421
421
 
422
 
  void DashView::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)
423
 
  {
424
 
    dash::Style& style = dash::Style::Instance();
425
 
    nux::Geometry geo(content_geo_);
 
422
void DashView::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)
 
423
{
 
424
  dash::Style& style = dash::Style::Instance();
 
425
  nux::Geometry geo(content_geo_);
426
426
 
427
427
  if (Settings::Instance().GetFormFactor() == FormFactor::DESKTOP)
428
428
  {