← Back to branch summary

~nux-team/nux/nux.attempt-to-fix-widgets-new

« back to all changes in this revision

Viewing changes to Nux/VLayout.cpp

  • Committer: Eleni Maria Stea
  • Date: 2012-12-13 15:17:26 UTC
  • mfrom: (700.2.40 trunk)
  • Revision ID: elene.mst@gmail.com-20121213151726-0lve6hjs74nddksb
local merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
Nux/VLayout.cpp
363
363
        if (!(*it)->IsVisible())
364
364
          continue;
365
365
 
366
 
        bool larger_height  = false;
367
 
        bool smaller_height = false;
368
 
        bool smaller_width  = false;
369
 
        bool larger_width   = false;
370
366
        int ret = 0;
371
367
 
372
368
        if (((*it)->IsLayout() || (*it)->IsView()) /*&& ((*it)->IsLayoutDone() == false)*/ /*&& ((*it)->GetScaleFactor() != 0)*/)
375
371
          ret = (*it)->ComputeContentSize();
376
372
          Geometry post_geo = (*it)->GetNativeGeometry();
377
373
 
378
 
          larger_width    = (pre_geo.width < post_geo.width)    ? true : false;
379
 
          smaller_width   = (pre_geo.width > post_geo.width)    ? true : false;
380
 
          larger_height   = (pre_geo.height < post_geo.height)  ? true : false;
381
 
          smaller_height  = (pre_geo.height > post_geo.height)  ? true : false;
 
374
          bool larger_width    = pre_geo.width < post_geo.width;
 
375
          bool smaller_width   = pre_geo.width > post_geo.width;
 
376
          bool larger_height   = pre_geo.height < post_geo.height;
 
377
          bool smaller_height  = pre_geo.height > post_geo.height;
382
378
 
383
379
          if ((larger_height || smaller_height) && ((*it)->IsLayoutDone() == false))
384
380
          {