feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '1.0.0'

Browse Source 
Conflicts:
	src/libs/cplusplus/Overview.h
	src/libs/cplusplus/TypePrettyPrinter.cpp
	src/plugins/cpptools/cppcodecompletion.cpp
This commit is contained in:
Thorbjørn Lindeijer
2009-02-16 18:42:22 +01:00
parent fa216de41c d94dd392cb
commit 3230017eaf
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -2504,14 +2504,13 @@ void BaseTextEditor::extraAreaMouseEvent(QMouseEvent *e)
}
}
if (e->type() == QEvent::MouseButtonPress || e->type() == QEvent::MouseButtonDblClick) {
if (e->button() == Qt::LeftButton) {
if (d->m_codeFoldingVisible && TextBlockUserData::canCollapse(cursor.block())
&& !TextBlockUserData::hasClosingCollapseInside(cursor.block().next())
&& collapseBox(cursor.block()).contains(e->pos())) {
setTextCursor(cursor);
toggleBlockVisible(cursor.block());
d->moveCursorVisible(false);
} else if (d->m_marksVisible && e->pos().x() > markWidth) {
QTextCursor selection = cursor;
selection.setVisualNavigation(true);
@@ -3392,15 +3391,16 @@ void BaseTextEditor::setIfdefedOutBlocks(const QList<BaseTextEditor::BlockRange>
}
void BaseTextEditorPrivate::moveCursorVisible()
void BaseTextEditorPrivate::moveCursorVisible(bool ensureVisible)
{
QTextCursor cursor = q->textCursor();
if (!cursor.block().isVisible()) {
cursor.setVisualNavigation(true);
cursor.movePosition(QTextCursor::PreviousBlock);
cursor.movePosition(QTextCursor::Up);
q->setTextCursor(cursor);
}
q->ensureCursorVisible();
if (ensureVisible)
q->ensureCursorVisible();
}
void BaseTextEditor::collapse()