alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make some better decisions.

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=777237
This commit is contained in:
Bill Egert 2008-02-20 03:00:26 +00:00
parent ee91508f3c
commit 74e2ce31ff
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layouts/flowlayout.cpp
View File

@ -152,7 +152,7 @@ void FlowLayout::relayout()
qreal colWidth = 0; qreal colWidth = 0;
qreal rowHeight = 0; qreal rowHeight = 0;
qreal maxItemWidth = 0; qreal maxItemWidth = 0;
//qreal minItemWidth = 0; qreal minItemWidth = 0;
//qreal maxItemHeight = 0; //qreal maxItemHeight = 0;
qreal minItemHeight = 0; qreal minItemHeight = 0;
int colCnt = 0; int colCnt = 0;
@ -161,8 +161,8 @@ void FlowLayout::relayout()
foreach(LayoutItem *item , d->items) { foreach(LayoutItem *item , d->items) {
maxItemWidth = (maxItemWidth < item->maximumSize().width()) ? maxItemWidth = (maxItemWidth < item->maximumSize().width()) ?
item->maximumSize().width() : maxItemWidth; item->maximumSize().width() : maxItemWidth;
//minItemWidth = (minItemWidth < item->minimumSize().width()) ? minItemWidth = (minItemWidth < item->minimumSize().width()) ?
// item->minimumSize().width() : minItemWidth; item->minimumSize().width() : minItemWidth;
//maxItemHeight = (maxItemHeight < item->maximumSize().height()) ? //maxItemHeight = (maxItemHeight < item->maximumSize().height()) ?
// item->maximumSize().height() : maxItemHeight; // item->maximumSize().height() : maxItemHeight;
minItemHeight = (minItemHeight < item->minimumSize().height()) ? minItemHeight = (minItemHeight < item->minimumSize().height()) ?
@ -172,9 +172,12 @@ void FlowLayout::relayout()
const int rowMax = ((minItemHeight != 0) && (minItemHeight != rectHeight)) ? const int rowMax = ((minItemHeight != 0) && (minItemHeight != rectHeight)) ?
(int)(rectHeight / (minItemHeight + space)) : 1; (int)(rectHeight / (minItemHeight + space)) : 1;
if( maxItemWidth == 0) { if( maxItemWidth == 0 && minItemWidth != 0 ) {
kDebug() << "******POSSIBLE DIVIDE BY ZERO: maxItemWidth ********"; kDebug() << "******POSSIBLE DIVIDE BY ZERO: maxItemWidth = minItemWidth ********";
maxItemWidth = 20; maxItemWidth = minItemWidth + space;
} else if( maxItemWidth == 0 && minItemWidth == 0 ) {
kDebug() << "******POSSIBLE DIVIDE BY ZERO: maxItemWidth = rectWidth ********";
maxItemWidth = rectWidth + space;
} }
// try to use the maxwidth if there is room // try to use the maxwidth if there is room