Attachment 72848 Details for Bug 153029

[patch] qt3 patch

src.patch (text/plain), 2.53 KB, created by Lubos Lunak on 2006-03-14 19:36:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubos Lunak

Created: 2006-03-14 19:36:27 UTC

Size: 2.53 KB

patch

obsolete

>--- src/kernel/qlayout.cpp.sav	2006-03-07 17:16:04.000000000 +0100
>+++ src/kernel/qlayout.cpp	2006-03-14 20:30:57.000000000 +0100
>@@ -679,7 +679,8 @@ void QGridLayoutData::addHfwData( QGridB
>     if ( box->hasHeightForWidth() ) {
> 	int hint = box->heightForWidth( width );
> 	rData[box->row].sizeHint = QMAX( hint, rData[box->row].sizeHint );
>-	rData[box->row].minimumSize = QMAX( hint, rData[box->row].minimumSize );
>+	rData[box->row].minimumSize = QMAX( box->minimumSize().height(), rData[box->row].minimumSize );
>+//	rData[box->row].minimumSize = QMAX( hint, rData[box->row].minimumSize );
>     } else {
> 	QSize hint = box->sizeHint();
> 	QSize minS = box->minimumSize();
>@@ -733,8 +734,8 @@ void QGridLayoutData::setupHfwLayoutData
> 		    int hfwh = box->heightForWidth( w );
> 		    if ( hfwh > hint.height() )
> 			hint.setHeight( hfwh );
>-		    if ( hfwh > min.height() )
>-			min.setHeight( hfwh );
>+//		    if ( hfwh > min.height() )
>+//			min.setHeight( hfwh );
> 		}
> 		distributeMultiBox( rData, spacing, r1, r2,
> 				    min.height(), hint.height(),
>@@ -1528,11 +1529,11 @@ struct QBoxLayoutItem
> 	}
>     }
>     int mhfw( int w ) {
>-	if ( item->hasHeightForWidth() ) {
>-	    return item->heightForWidth( w );
>-	} else {
>+//	if ( item->hasHeightForWidth() ) {
>+//	    return item->heightForWidth( w );
>+//	} else {
> 	    return item->minimumSize().height();
>-	}
>+//	}
>     }
>     int hStretch() {
> 	if ( stretch == 0 && item->widget() ) {
>@@ -1909,7 +1910,7 @@ void QBoxLayout::setGeometry( const QRec
> 	    for ( int i = 0; i < n; i++ ) {
> 		QBoxLayoutItem *box = data->list.at( i );
> 		if ( box->item->hasHeightForWidth() )
>-		    a[i].sizeHint = a[i].minimumSize =
>+		    a[i].sizeHint /*= a[i].minimumSize*/ =
> 				    box->item->heightForWidth( s.width() );
> 	    }
> 	}
>--- src/widgets/qlabel.cpp.sav	2005-09-15 15:39:43.000000000 +0200
>+++ src/widgets/qlabel.cpp	2006-03-14 20:31:00.000000000 +0100
>@@ -636,21 +636,7 @@ QSize QLabel::minimumSizeHint() const
>     constPolish();
>     d->valid_hints = frameWidth();
>     d->sh = sizeForWidth( -1 );
>-    QSize sz( -1, -1 );
>-
>-    if (
>-#ifndef QT_NO_RICHTEXT
>-	 !doc &&
>-#endif
>-	 (align & WordBreak) == 0 ) {
>-	sz = d->sh;
>-    } else {
>-	// think about caching these for performance
>-	sz.rwidth() = sizeForWidth( 0 ).width();
>-	sz.rheight() = sizeForWidth(QWIDGETSIZE_MAX).height();
>-	if ( d->sh.height() < sz.height() )
>-	    sz.rheight() = d->sh.height();
>-    }
>+    QSize sz = d->sh;
>     if ( sizePolicy().horData() == QSizePolicy::Ignored )
> 	sz.rwidth() = -1;
>     if ( sizePolicy().verData() == QSizePolicy::Ignored )

Actions: View | Diff

Attachments on bug 153029: 69912 | 69913 | 72848