diff options
| author | jkobus <jaroslaw.kobus@digia.com> | 2013-04-10 13:51:04 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-04-15 18:09:35 +0200 |
| commit | 186c457d6c15415aa204fe41eede16b2ea480de0 (patch) | |
| tree | 75663ff05ff41f566d7ed5f99ada3992593d84c6 /src/plugins/diffeditor/diffeditorwidget.h | |
| parent | 0cbcd365e557523614e052a6a040548c22cf6a77 (diff) | |
| download | qt-creator-186c457d6c15415aa204fe41eede16b2ea480de0.tar.gz | |
Implement expanding / shrinking skipped lines
Change-Id: I6921b7a39288f6a9747574b1a8e75d571f4723ce
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorwidget.h')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorwidget.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffeditorwidget.h b/src/plugins/diffeditor/diffeditorwidget.h index 84503b31b1..e576238637 100644 --- a/src/plugins/diffeditor/diffeditorwidget.h +++ b/src/plugins/diffeditor/diffeditorwidget.h @@ -124,6 +124,8 @@ protected: private slots: void leftSliderChanged(); void rightSliderChanged(); + void leftDocumentSizeChanged(); + void rightDocumentSizeChanged(); private: bool isWhitespace(const QChar &c) const; @@ -136,6 +138,7 @@ private: ChunkData calculateOriginalData(const QList<Diff> &diffList) const; FileData calculateContextData(const ChunkData &originalData) const; void showDiff(); + void synchronizeFoldings(DiffViewEditorWidget *source, DiffViewEditorWidget *destination); DiffViewEditorWidget *m_leftEditor; DiffViewEditorWidget *m_rightEditor; @@ -147,6 +150,8 @@ private: ChunkData m_originalChunkData; FileData m_contextFileData; + + bool m_foldingBlocker; }; } // namespace DiffEditor |