0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix weird label line generation in the instance view.

Browse Source
This commit is contained in:
Petr Mrázek
2013-06-23 22:45:36 +02:00
parent 27b1de0d6d
commit 38fb702e78
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gui/instancedelegate.cpp
View File

@@ -11,11 +11,14 @@ static void viewItemTextLayout ( QTextLayout &textLayout, int lineWidth, qreal &
height = 0; height = 0;
widthUsed = 0; widthUsed = 0;
textLayout.beginLayout(); textLayout.beginLayout();
QString str = textLayout.text();
while ( true ) while ( true )
{ {
QTextLine line = textLayout.createLine(); QTextLine line = textLayout.createLine();
if ( !line.isValid() ) if ( !line.isValid() )
break; break;
if(line.textLength() == 0)
break;
line.setLineWidth ( lineWidth ); line.setLineWidth ( lineWidth );
line.setPosition ( QPointF ( 0, height ) ); line.setPosition ( QPointF ( 0, height ) );
height += line.height(); height += line.height();
@@ -191,11 +194,11 @@ void ListViewDelegate::paint ( QPainter* painter, const QStyleOptionViewItem& op
textLayout.setText ( opt.text ); textLayout.setText ( opt.text );
qreal width, height; qreal width, height;
viewItemTextLayout ( textLayout, iconbox.width(), height, width ); viewItemTextLayout ( textLayout, textRect.width(), height, width );
const int lineCount = textLayout.lineCount(); const int lineCount = textLayout.lineCount();
const QRect layoutRect = QStyle::alignedRect ( opt.direction, opt.displayAlignment, QSize ( iconbox.width(), int ( height ) ), textRect ); const QRect layoutRect = QStyle::alignedRect ( opt.direction, opt.displayAlignment, QSize ( textRect.width(), int ( height ) ), textRect );
const QPointF position = layoutRect.topLeft(); const QPointF position = layoutRect.topLeft();
for ( int i = 0; i < lineCount; ++i ) for ( int i = 0; i < lineCount; ++i )
{ {