← Back to branch summary

~azzar1/unity/damage-screen-when-animating

« back to all changes in this revision

Viewing changes to unity-shared/OverlayRenderer.cpp

  • Committer: Andrea Azzarone
  • Date: 2012-09-17 00:39:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2712.
  • Revision ID: azzaronea@gmail.com-20120917003931-vsamvlcclqyim8pz
Use a nux::RWProperty for the form factor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
unity-shared/OverlayRenderer.cpp
438
438
  bool paint_blur = BackgroundEffectHelper::blur_type != BLUR_NONE;
439
439
  nux::Geometry geo(content_geo);
440
440
 
441
 
  int excess_border = (Settings::Instance().GetFormFactor() != FormFactor::NETBOOK || force_edges) ? EXCESS_BORDER : 0;
 
441
  int excess_border = (Settings::Instance().form_factor() != FormFactor::NETBOOK || force_edges) ? EXCESS_BORDER : 0;
442
442
 
443
443
  nux::Geometry larger_content_geo = content_geo;
444
444
  larger_content_geo.OffsetSize(excess_border, excess_border);
578
578
  }
579
579
 
580
580
 
581
 
  if (Settings::Instance().GetFormFactor() != FormFactor::NETBOOK || force_edges)
 
581
  if (Settings::Instance().form_factor() != FormFactor::NETBOOK || force_edges)
582
582
  {
583
583
    // Paint the edges
584
584
    {
835
835
  nux::Geometry geo = geometry;
836
836
  bgs = 0;
837
837
 
838
 
  int excess_border = (Settings::Instance().GetFormFactor() != FormFactor::NETBOOK) ? EXCESS_BORDER : 0;
 
838
  int excess_border = (Settings::Instance().form_factor() != FormFactor::NETBOOK) ? EXCESS_BORDER : 0;
839
839
 
840
840
  nux::Geometry larger_content_geo = content_geo;
841
841
  larger_content_geo.OffsetSize(excess_border, excess_border);