Added configuration for displaying tabs and spaces separately (BalazsJako#31)

Author: goossens

README.md

@@ -86,7 +86,7 @@ public API to externally implement these features is however included.
 - Has API to filter each line in editor (with full undo support).
 - Tabs to Space (and visa versa) are examples of line filtering.
 - Has API to strip trailing whitespaces.
-- Provides whitespace indicators for tabs and spaces (can be turned on and off).
+- Provides whitespace indicators for tabs and spaces (can be turned on and off individually or collectively).
 - No longer uses regular expressions for colorizing text (see below).
 - Provides an optional companion widget to show source code differences between versions (see below).
 

TextDiff.cpp

@@ -403,7 +403,7 @@ void TextDiff::renderSideBySideLine(float x, float y, TextEditor::Line& line) {
 		ImVec2 glyphPos(x + column * glyphSize.x - textScroll, y);
 
 		if (codepoint == '\t') {
-			if (showWhitespaces) {
+			if (showTabs) {
 				const auto x1 = glyphPos.x + glyphSize.x * 0.3f;
 				const auto y1 = glyphPos.y + fontSize * 0.5f;
 				const auto x2 = glyphPos.x + glyphSize.x;
@@ -420,7 +420,7 @@ void TextDiff::renderSideBySideLine(float x, float y, TextEditor::Line& line) {
 			}
 
 		} else if (codepoint == ' ') {
-			if (showWhitespaces) {
+			if (showSpaces) {
 				const auto x1 = glyphPos.x + glyphSize.x * 0.5f;
 				const auto y1 = glyphPos.y + fontSize * 0.5f;
 				drawList->AddCircleFilled(ImVec2(x1, y1), 1.5f, palette.get(Color::whitespace), 4);

TextEditor.cpp

@@ -390,7 +390,7 @@ void TextEditor::renderText() {
 			ImVec2 glyphPos{lineScreenPos.x + column * glyphSize.x, lineScreenPos.y};
 
 			if (codepoint == '\t') {
-				if (showWhitespaces) {
+				if (showTabs) {
 					const auto x1 = glyphPos.x + glyphSize.x * 0.3f;
 					const auto y = glyphPos.y + fontSize * 0.5f;
 					const auto x2 = glyphPos.x + glyphSize.x;
@@ -407,7 +407,7 @@ void TextEditor::renderText() {
 				}
 
 			} else if (codepoint == ' ') {
-				if (showWhitespaces) {
+				if (showSpaces) {
 					const auto x = glyphPos.x + glyphSize.x * 0.5f;
 					const auto y = glyphPos.y + fontSize * 0.5f;
 					drawList->AddCircleFilled(ImVec2(x, y), 1.5f, palette.get(Color::whitespace), 4);

TextEditor.h

@@ -56,8 +56,12 @@ class TextEditor {
 	inline bool IsReadOnlyEnabled() const { return readOnly; }
 	inline void SetAutoIndentEnabled(bool value) { autoIndent = value; }
 	inline bool IsAutoIndentEnabled() const { return autoIndent; }
-	inline void SetShowWhitespacesEnabled(bool value) { showWhitespaces = value; }
-	inline bool IsShowWhitespacesEnabled() const { return showWhitespaces; }
+	inline void SetShowWhitespacesEnabled(bool value) { showSpaces = value; showTabs = value; }
+	inline bool IsShowWhitespacesEnabled() const { return showSpaces && showTabs; }
+	inline void SetShowSpacesEnabled(bool value) { showSpaces = value; }
+	inline bool IsShowSpacesEnabled() const { return showSpaces; }
+	inline void SetShowTabsEnabled(bool value) { showTabs = value; }
+	inline bool IsShowTabsEnabled() const { return showTabs; }
 	inline void SetShowLineNumbersEnabled(bool value) { showLineNumbers = value; }
 	inline bool IsShowLineNumbersEnabled() const { return showLineNumbers; }
 	inline void SetShowScrollbarMiniMapEnabled(bool value) { showScrollbarMiniMap = value; }
@@ -1032,7 +1036,8 @@ class TextEditor {
 	float lineSpacing = 1.0f;
 	bool readOnly = false;
 	bool autoIndent = true;
-	bool showWhitespaces = true;
+	bool showSpaces = true;
+	bool showTabs = true;
 	bool showLineNumbers = true;
 	bool showScrollbarMiniMap = true;
 	bool showMatchingBrackets = true;

example/editor.cpp

@@ -280,6 +280,8 @@ void Editor::renderMenuBar() {
 
 			bool flag;
 			flag = editor.IsShowWhitespacesEnabled(); if (ImGui::MenuItem("Show Whitespaces", nullptr, &flag)) { editor.SetShowWhitespacesEnabled(flag); };
+			flag = editor.IsShowSpacesEnabled(); if (ImGui::MenuItem("Show Spaces", nullptr, &flag)) { editor.SetShowSpacesEnabled(flag); };
+			flag = editor.IsShowTabsEnabled(); if (ImGui::MenuItem("Show Tabs", nullptr, &flag)) { editor.SetShowTabsEnabled(flag); };
 			flag = editor.IsShowLineNumbersEnabled(); if (ImGui::MenuItem("Show Line Numbers", nullptr, &flag)) { editor.SetShowLineNumbersEnabled(flag); };
 			flag = editor.IsShowingMatchingBrackets(); if (ImGui::MenuItem("Show Matching Brackets", nullptr, &flag)) { editor.SetShowMatchingBrackets(flag); };
 			flag = editor.IsCompletingPairedGlyphs(); if (ImGui::MenuItem("Complete Matching Glyphs", nullptr, &flag)) { editor.SetCompletePairedGlyphs(flag); };