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

Respect tab settings in diff editor

Browse Source 
Currently it's not possible to respect language specific tab
settings in diff editor. It can happen that one view
contains C++/Qt Quick files, while tab settings
are common for the whole view.

Change-Id: I45c6113afd7d41667b68a4daba0ac0fa4472b4e9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2013-05-21 15:47:04 +02:00
committed by Jarek Kobus
parent 780c8283e9
commit 55717e1167
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/diffeditor/diffeditorwidget.cpp
View File

@@ -487,12 +487,14 @@ DiffEditorWidget::DiffEditorWidget(QWidget *parent)
m_leftEditor->setHighlightCurrentLine(false); m_leftEditor->setHighlightCurrentLine(false);
m_leftEditor->setWordWrapMode(QTextOption::NoWrap); m_leftEditor->setWordWrapMode(QTextOption::NoWrap);
m_leftEditor->setFontSettings(settings->fontSettings()); m_leftEditor->setFontSettings(settings->fontSettings());
m_leftEditor->setCodeStyle(settings->codeStyle());
m_rightEditor = new DiffViewEditorWidget(this); m_rightEditor = new DiffViewEditorWidget(this);
m_rightEditor->setReadOnly(true); m_rightEditor->setReadOnly(true);
m_rightEditor->setHighlightCurrentLine(false); m_rightEditor->setHighlightCurrentLine(false);
m_rightEditor->setWordWrapMode(QTextOption::NoWrap); m_rightEditor->setWordWrapMode(QTextOption::NoWrap);
m_rightEditor->setFontSettings(settings->fontSettings()); m_rightEditor->setFontSettings(settings->fontSettings());
m_rightEditor->setCodeStyle(settings->codeStyle());
connect(m_leftEditor->verticalScrollBar(), SIGNAL(valueChanged(int)), connect(m_leftEditor->verticalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(leftSliderChanged())); this, SLOT(leftSliderChanged()));