From d10389b9c59b7139d61512b897a6c761292a303a Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Thu, 4 Jun 2009 16:40:34 +0200 Subject: [PATCH 1/2] Increase the delay for folding blocks Details: 40 ms seems a bit too short. We should at least allow the mouse cursor to pass undetected. The 10 ms delay seems a bit redundant. --- src/plugins/texteditor/basetexteditor.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 5448be6d4a3..914c565552c 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) { From a7e4e0b720c43aaa5589c9e102d7d18274fac952 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Thu, 4 Jun 2009 17:58:47 +0200 Subject: [PATCH 2/2] Fixes: Fix progress dialog on mac --- src/plugins/coreplugin/progressmanager/progresspie.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/progressmanager/progresspie.cpp b/src/plugins/coreplugin/progressmanager/progresspie.cpp index d32f7e763ac..744ba598650 100644 --- a/src/plugins/coreplugin/progressmanager/progresspie.cpp +++ b/src/plugins/coreplugin/progressmanager/progresspie.cpp @@ -35,6 +35,7 @@ #include #include #include +#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);