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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
This commit is contained in:
dt
2010-11-10 17:00:07 +01:00
parent f987eccd28 fb46c31934
commit 4ac7253205
31 changed files with 357 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2234,10 +2234,13 @@ bool BaseTextEditor::lineSeparatorsAllowed() const
return d->m_lineSeparatorsAllowed;
}
void BaseTextEditor::setCodeFoldingVisible(bool b)
void BaseTextEditor::updateCodeFoldingVisible()
{
d->m_codeFoldingVisible = b && d->m_codeFoldingSupported;
slotUpdateExtraAreaWidth();
const bool visible = d->m_codeFoldingSupported && d->m_displaySettings.m_displayFoldingMarkers;
if (d->m_codeFoldingVisible != visible) {
d->m_codeFoldingVisible = visible;
slotUpdateExtraAreaWidth();
}
}
bool BaseTextEditor::codeFoldingVisible() const
@@ -2254,6 +2257,7 @@ bool BaseTextEditor::codeFoldingVisible() const
void BaseTextEditor::setCodeFoldingSupported(bool b)
{
d->m_codeFoldingSupported = b;
updateCodeFoldingVisible();
}
bool BaseTextEditor::codeFoldingSupported() const
@@ -5522,7 +5526,6 @@ void BaseTextEditor::setDisplaySettings(const DisplaySettings &ds)
setLineWrapMode(ds.m_textWrapping ? QPlainTextEdit::WidgetWidth : QPlainTextEdit::NoWrap);
setLineNumbersVisible(ds.m_displayLineNumbers);
setVisibleWrapColumn(ds.m_showWrapColumn ? ds.m_wrapColumn : 0);
setCodeFoldingVisible(ds.m_displayFoldingMarkers);
setHighlightCurrentLine(ds.m_highlightCurrentLine);
setRevisionsVisible(ds.m_markTextChanges);
setCenterOnScroll(ds.m_centerCursorOnScroll);
@@ -5545,6 +5548,7 @@ void BaseTextEditor::setDisplaySettings(const DisplaySettings &ds)
d->m_highlightBlocksInfo = BaseTextEditorPrivateHighlightBlocks();
}
updateCodeFoldingVisible();
updateHighlights();
viewport()->update();
extraArea()->update();