diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-01-21 11:26:39 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-01-24 08:00:07 +0100 |
| commit | 3fa6b6737c48049cb3d6e06ef0c1cfcb30dfd595 (patch) | |
| tree | b67162542fb606e2265da414f1525e9141153cb1 /src/plugins/diffeditor/diffeditorwidget.cpp | |
| parent | b59d61e2a42fd226d3009bf7c48e6fa9fffbb85e (diff) | |
| download | qt-creator-3fa6b6737c48049cb3d6e06ef0c1cfcb30dfd595.tar.gz | |
TextEditors: Move font settings to document
Change-Id: I325764cbaa9684fa2758b0ea6c6ea58de142cb73
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorwidget.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorwidget.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/diffeditor/diffeditorwidget.cpp b/src/plugins/diffeditor/diffeditorwidget.cpp index 8561f9f8e1..3e5ce74bef 100644 --- a/src/plugins/diffeditor/diffeditorwidget.cpp +++ b/src/plugins/diffeditor/diffeditorwidget.cpp @@ -185,7 +185,6 @@ public: public slots: void setDisplaySettings(const DisplaySettings &ds); - void setFontSettings(const TextEditor::FontSettings &fs); signals: void jumpToOriginalFileRequested(int diffFileIndex, @@ -194,6 +193,7 @@ signals: protected: virtual int extraAreaWidth(int *markWidthPtr = 0) const { return BaseTextEditorWidget::extraAreaWidth(markWidthPtr); } + void applyFontSettings(); BaseTextEditor *createEditor() { return new DiffViewEditorEditable(this); } virtual QString lineNumber(int blockNumber) const; virtual int lineNumberDigits() const; @@ -356,9 +356,10 @@ void DiffViewEditorWidget::setDisplaySettings(const DisplaySettings &ds) BaseTextEditorWidget::setDisplaySettings(settings); } -void DiffViewEditorWidget::setFontSettings(const TextEditor::FontSettings &fs) +void DiffViewEditorWidget::applyFontSettings() { - BaseTextEditorWidget::setFontSettings(fs); + BaseTextEditorWidget::applyFontSettings(); + const TextEditor::FontSettings &fs = baseTextDocument()->fontSettings(); m_fileLineForeground = fs.formatFor(C_DIFF_FILE_LINE).foreground(); m_chunkLineForeground = fs.formatFor(C_DIFF_CONTEXT_LINE).foreground(); m_textForeground = fs.toTextCharFormat(C_TEXT).foreground().color(); @@ -1578,8 +1579,8 @@ static QTextCharFormat fullWidthFormatForTextStyle(const TextEditor::FontSetting void DiffEditorWidget::setFontSettings(const TextEditor::FontSettings &fontSettings) { - m_leftEditor->setFontSettings(fontSettings); - m_rightEditor->setFontSettings(fontSettings); + m_leftEditor->baseTextDocument()->setFontSettings(fontSettings); + m_rightEditor->baseTextDocument()->setFontSettings(fontSettings); m_fileLineFormat = fullWidthFormatForTextStyle(fontSettings, C_DIFF_FILE_LINE); m_chunkLineFormat = fullWidthFormatForTextStyle(fontSettings, C_DIFF_CONTEXT_LINE); |