diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/coreplugin/progressmanager/progresspie.cpp | 5 | ||||
-rw-r--r-- | src/plugins/texteditor/basetexteditor.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/progressmanager/progresspie.cpp b/src/plugins/coreplugin/progressmanager/progresspie.cpp index d32f7e763a..744ba59865 100644 --- a/src/plugins/coreplugin/progressmanager/progresspie.cpp +++ b/src/plugins/coreplugin/progressmanager/progresspie.cpp @@ -35,6 +35,7 @@ #include <QtGui/QBrush> #include <QtGui/QColor> #include <QtDebug> +#define PROGRESSBAR_HEIGHT 11 ProgressBar::ProgressBar(QWidget *parent) : QProgressBar(parent), m_error(false) @@ -72,7 +73,7 @@ QSize ProgressBar::sizeHint() const { QSize s; s.setWidth(50); - s.setHeight(fontMetrics().height() * 2); + s.setHeight(fontMetrics().height() + PROGRESSBAR_HEIGHT + 7); return s; } @@ -133,7 +134,7 @@ void ProgressBar::paintEvent(QPaintEvent *) p.drawText(textRect, Qt::AlignHCenter | Qt::AlignBottom, m_title); p.translate(0, 1); - m_progressHeight = h-4; + m_progressHeight = PROGRESSBAR_HEIGHT; m_progressHeight += ((m_progressHeight % 2) + 1) % 2; // make odd // draw outer rect QRect rect(INDENT - 1, h+6, size().width()-2*INDENT, m_progressHeight-1); diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 5448be6d4a..914c565552 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -2732,8 +2732,9 @@ void BaseTextEditor::extraAreaMouseEvent(QMouseEvent *e) } if (highlightBlockNumber != d->extraAreaHighlightCollapseBlockNumber - || highlightColumn != d->extraAreaHighlightCollapseColumn) - d->m_highlightBlocksTimer->start(d->m_highlightBlocksInfo.isEmpty() ? 40 : 10); + || highlightColumn != d->extraAreaHighlightCollapseColumn) { + d->m_highlightBlocksTimer->start(d->m_highlightBlocksInfo.isEmpty() ? 120 : 0); + } } if (e->type() == QEvent::MouseButtonPress || e->type() == QEvent::MouseButtonDblClick) { |