← Back to branch summary

~brandontschaefer/nux/destroy-XIC-on-window-hide

« back to all changes in this revision

Viewing changes to Nux/HLayout.cpp

  • Committer: Brandon Schaefer
  • Date: 2012-12-07 03:13:51 UTC
  • Revision ID: brandon.schaefer@canonical.com-20121207031351-y5zcvz6roti9s0w9
* Opps, pushed ontop of an unmerged branch...removing rev

Show diffs side-by-side

added added

removed removed

Lines of Context:
Nux/HLayout.cpp
364
364
          ret = (*it)->ComputeContentSize();
365
365
          Geometry post_geo = (*it)->GetGeometry();
366
366
 
367
 
          bool larger_width    = pre_geo.width < post_geo.width;
368
 
          bool smaller_width   = pre_geo.width > post_geo.width;
369
 
          bool larger_height   = pre_geo.height < post_geo.height;
370
 
          bool smaller_height  = pre_geo.height > post_geo.height;
 
367
          bool larger_width    = (pre_geo.width < post_geo.width)    ? true : false;
 
368
          bool smaller_width   = (pre_geo.width > post_geo.width)    ? true : false;
 
369
          bool larger_height   = (pre_geo.height < post_geo.height)  ? true : false;
 
370
          bool smaller_height  = (pre_geo.height > post_geo.height)  ? true : false;
371
371
 
372
372
          if ((larger_width || smaller_width) && ((*it)->IsLayoutDone() == false))
373
373
          {