Removed mode code for legacy font-based icons

ngscopeclient · Dec 1, 2023 · 81b2e84 · 81b2e84
1 parent e18fedd
commit 81b2e84
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/lib b/lib
diff --git a/src/ngscopeclient/FilterGraphEditor.cpp b/src/ngscopeclient/FilterGraphEditor.cpp
@@ -1970,10 +1970,6 @@ void FilterGraphEditor::NodeIcon(InstrumentChannel* chan, ImVec2 pos, ImVec2 ico
 {
 	pos.y += ImGui::GetStyle().ItemSpacing.y*2;
 
-	auto& prefs = m_session.GetPreferences();
-	auto iconfont = m_parent->GetFontPref("Appearance.Filter Graph.icon_font");
-	auto color = prefs.GetColor("Appearance.Filter Graph.icon_color");
-
 	//Some filters get graphical icons
 	//TODO: something less ugly than a big if-else cascade? hash map or something?
 	string iconname = "";

diff --git a/src/ngscopeclient/PreferenceSchema.cpp b/src/ngscopeclient/PreferenceSchema.cpp
@@ -144,14 +144,6 @@ void PreferenceManager::InitializeDefaults()
 				Preference::Color("invalid_link_color", ColorFromString("#ff0000"))
 				.Label("Invalid link color")
 				.Description("Color indicating a potential connection path is invalid"));
-			graph.AddPreference(
-				Preference::Font("icon_font", FontDescription(FindDataFile("fonts/DejaVuSans.ttf"), 40))
-				.Label("Icon font")
-				.Description("Font for math block icons"));
-			graph.AddPreference(
-				Preference::Color("icon_color", ColorFromString("#ffffff"))
-				.Label("Icon color")
-				.Description("Color for math block icons"));
 
 		auto& general = appearance.AddCategory("General");
 			general.AddPreference(
+36 −27		scopehal/LeCroyOscilloscope.cpp
+14 −1		scopehal/LeCroyOscilloscope.h
+2 −1		scopeprotocols/CurrentShuntFilter.cpp
+1 −1		scopeprotocols/MovingAverageFilter.cpp