diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-04-05 08:32:58 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-04-05 08:32:58 +1100 |
| commit | cb81cd27cd1b162c381db4106cb29c4c397146a8 (patch) | |
| tree | ac40f63a508d517d630cb266124b9bcebf914495 /src/ContractionState.cxx | |
| parent | 966c872120ea94941f2672f15cdcc9018a5a5dd0 (diff) | |
| download | scintilla-mirror-cb81cd27cd1b162c381db4106cb29c4c397146a8.tar.gz | |
Backport: Feature [feature-requests:#1272]. Add API to set default fold display text.
Backport of changeset 7400:9fcb52fdb307.
Diffstat (limited to 'src/ContractionState.cxx')
| -rw-r--r-- | src/ContractionState.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ContractionState.cxx b/src/ContractionState.cxx index c5e352180..47f345ada 100644 --- a/src/ContractionState.cxx +++ b/src/ContractionState.cxx @@ -74,7 +74,6 @@ public: bool HiddenLines() const override; const char *GetFoldDisplayText(Sci::Line lineDoc) const override; - bool GetFoldDisplayTextShown(Sci::Line lineDoc) const override; bool SetFoldDisplayText(Sci::Line lineDoc, const char *text) override; bool GetExpanded(Sci::Line lineDoc) const override; @@ -277,16 +276,11 @@ const char *ContractionState<LINE>::GetFoldDisplayText(Sci::Line lineDoc) const } template <typename LINE> -bool ContractionState<LINE>::GetFoldDisplayTextShown(Sci::Line lineDoc) const { - return !GetExpanded(lineDoc) && GetFoldDisplayText(lineDoc); -} - -template <typename LINE> bool ContractionState<LINE>::SetFoldDisplayText(Sci::Line lineDoc, const char *text) { EnsureData(); const char *foldText = foldDisplayTexts->ValueAt(lineDoc).get(); if (!foldText || !text || 0 != strcmp(text, foldText)) { - UniqueString uns = UniqueStringCopy(text); + UniqueString uns = IsNullOrEmpty(text) ? UniqueString() : UniqueStringCopy(text); foldDisplayTexts->SetValueAt(lineDoc, std::move(uns)); Check(); return true; |