Author: sh-sh-sh Date: Fri Oct 12 12:09:44 2007 New Revision: 41401 URL: http://svn.opensuse.org/viewcvs/yast?rev=41401&view=rev Log: make childless containers safe Modified: branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc?rev=41401&r1=41400&r2=41401&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc Fri Oct 12 12:09:44 2007 @@ -175,8 +175,10 @@ bool YAlignment::stretchable( YUIDimension dim ) const { - if ( alignment( dim ) == YAlignUnchanged ) return firstChild()->stretchable( dim ); - else return true; + if ( alignment( dim ) == YAlignUnchanged && hasChildren() ) + return firstChild()->stretchable( dim ); + else + return true; } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc?rev=41401&r1=41400&r2=41401&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc Fri Oct 12 12:09:44 2007 @@ -63,6 +63,9 @@ bool YSquash::stretchable( YUIDimension dim ) const { + if ( ! hasChildren() ) + return false; + return ! priv->squash[ dim ] && firstChild()->stretchable( dim ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org