|
|
|
|
@ -64,10 +64,10 @@ diff -u -3 -p -r1.54 qiconview.cpp
|
|
|
|
|
}
|
|
|
|
|
item->dirty = FALSE;
|
|
|
|
|
} else {
|
|
|
|
|
- QRegion r( QRect( 0, 0, QMAX( contentsWidth(), visibleWidth() ),
|
|
|
|
|
- QMAX( contentsHeight(), visibleHeight() ) ) );
|
|
|
|
|
+ QRegion r( QRect( 0, 0, QMAX( contentsWidth(), visibleWidthSB() ),
|
|
|
|
|
+ QMAX( contentsHeight(), visibleHeightSB() ) ) );
|
|
|
|
|
- QRegion r( QRect( 0, 0, TQMAX( contentsWidth(), visibleWidth() ),
|
|
|
|
|
- TQMAX( contentsHeight(), visibleHeight() ) ) );
|
|
|
|
|
+ QRegion r( QRect( 0, 0, TQMAX( contentsWidth(), visibleWidthSB() ),
|
|
|
|
|
+ TQMAX( contentsHeight(), visibleHeightSB() ) ) );
|
|
|
|
|
|
|
|
|
|
QIconViewItem *i = d->firstItem;
|
|
|
|
|
int y = -1;
|
|
|
|
|
@ -118,7 +118,7 @@ diff -u -3 -p -r1.54 qiconview.cpp
|
|
|
|
|
+
|
|
|
|
|
+ int offset = verticalScrollBar()->isVisible() ? 0
|
|
|
|
|
+ : style().pixelMetric( QStyle::PM_ScrollBarExtent, verticalScrollBar() );
|
|
|
|
|
+ return QMAX( 0, visibleWidth() - offset );
|
|
|
|
|
+ return TQMAX( 0, visibleWidth() - offset );
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+int QIconView::visibleHeightSB() const
|
|
|
|
|
@ -128,7 +128,7 @@ diff -u -3 -p -r1.54 qiconview.cpp
|
|
|
|
|
+
|
|
|
|
|
+ int offset = horizontalScrollBar()->isVisible() ? 0
|
|
|
|
|
+ : style().pixelMetric( QStyle::PM_ScrollBarExtent, horizontalScrollBar() );
|
|
|
|
|
+ return QMAX( 0, visibleHeight() - offset );
|
|
|
|
|
+ return TQMAX( 0, visibleHeight() - offset );
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
#endif // QT_NO_ICONVIEW
|
|
|
|
|
|
Darrell Anderson
11 years ago