Browse Source

FL: Fix error in flowpack layout.

tags/non-daw-v1.2.0
Jonathan Moore Liles 11 years ago
parent
commit
8f89e237e9
1 changed files with 10 additions and 6 deletions
  1. +10
    -6
      FL/Fl_Flowpack.H

+ 10
- 6
FL/Fl_Flowpack.H View File

@@ -119,15 +119,15 @@ public:
int LX = 0;
int LY = 0;

int RH = 0;

for ( int i = 0; i < children(); ++i )
{
Fl_Widget *o = child( i );

if ( ! o->visible() )
continue;

H = o->h() > H ? o->h() : H;

if ( _flow )
{
if ( _flowdown && Y + o->h() < H )
@@ -138,18 +138,20 @@ public:
else if ( X + o->w() >= W )
{
/* maybe wrap to the next row */
H += o->h();
H += RH + _vspacing;
RH = 0;
X = 0;
}
else
{
/* otherwise, put it in the next column */
Y = 0;
Y = H;
}

}

RH = o->h() > RH ? o->h() : RH;

LW = o->w();
LH = o->h();

@@ -183,6 +185,8 @@ public:
_max_width = X;
}

H += RH;

if ( ! _flow )
W = X;
}


Loading…
Cancel
Save