Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

This commit is contained in:
mae
2009-05-04 14:47:36 +02:00
2 changed files with 10 additions and 9 deletions

View File

@@ -2358,7 +2358,7 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
if (drawBox) {
bool expanded = nextBlock.isVisible();
QRect box(extraAreaWidth + collapseBoxWidth/4 + 1, top + collapseBoxWidth/4,
QRect box(extraAreaWidth + collapseBoxWidth/4, top + collapseBoxWidth/4,
2 * (collapseBoxWidth/4) + 1, 2 * (collapseBoxWidth/4) + 1);
drawFoldingMarker(&painter, box, expanded, active);
}
@@ -2408,7 +2408,7 @@ void BaseTextEditor::drawFoldingMarker(QPainter *painter, const QRect &rect,
bool expanded, bool hovered) const
{
QStyleOptionViewItemV2 opt;
opt.rect = QRect(rect.center(), QSize());
opt.rect = rect;
opt.state = QStyle::State_Active | QStyle::State_Item | QStyle::State_Children;
if (expanded)