Added RenderOnOffToggleEXT, fixed interleaving toggle to work properly

Author: azonenberg

src/ngscopeclient/StreamBrowserDialog.cpp

@@ -370,6 +370,8 @@ bool StreamBrowserDialog::renderCombo(
    @param color the color of the toggle button
    @param curValue the value of the toggle button
    @return the selected value for the toggle button
+
+   TODO: replace with renderToggleEXT
  */
 bool StreamBrowserDialog::renderToggle(const char* label, bool alignRight, ImVec4 color, bool curValue)
 {
@@ -378,11 +380,28 @@ bool StreamBrowserDialog::renderToggle(const char* label, bool alignRight, ImVec
 	return (selection == 1);
 }
 
+/**
+   @brief Render a toggle button combo
+
+   @param color the color of the toggle button
+   @param curValue the value of the toggle button
+   @return true if selection has changed
+ */
+bool StreamBrowserDialog::renderToggleEXT(const char* label, bool alignRight, ImVec4 color, bool& curValue)
+{
+	int selection = (int)curValue;
+	bool ret = renderCombo(label, alignRight, color, &selection, "OFF", "ON", nullptr);
+	curValue = (selection == 1);
+	return ret;
+}
+
 /**
    @brief Render an on/off toggle button combo
 
    @param curValue the value of the toggle button
    @return the selected value for the toggle button
+
+   TODO: replace with renderOnOffToggleEXT
  */
 bool StreamBrowserDialog::renderOnOffToggle(const char* label, bool alignRight, bool curValue)
 {
@@ -394,6 +413,22 @@ bool StreamBrowserDialog::renderOnOffToggle(const char* label, bool alignRight,
 	return renderToggle(label, alignRight, color, curValue);
 }
 
+/**
+   @brief Render an on/off toggle button combo
+
+   @param curValue the value of the toggle button
+   @return true if value has changed
+ */
+bool StreamBrowserDialog::renderOnOffToggleEXT(const char* label, bool alignRight, bool& curValue)
+{
+	auto& prefs = m_session.GetPreferences();
+	ImVec4 color = ImGui::ColorConvertU32ToFloat4(
+		(curValue ?
+			prefs.GetColor("Appearance.Stream Browser.instrument_on_badge_color") :
+			prefs.GetColor("Appearance.Stream Browser.instrument_off_badge_color")));
+	return renderToggleEXT(label, alignRight, color, curValue);
+}
+
 /**
    @brief Render a download progress bar for a given instrument channel
 
@@ -1053,7 +1088,7 @@ void StreamBrowserDialog::DoTimebaseSettings(shared_ptr<Oscilloscope> scope)
 	ImGui::SetNextItemWidth(width);
 	bool disabled = !scope->CanInterleave();
 	ImGui::BeginDisabled(disabled);
-	if(renderOnOffToggle("Interleaving", false, config->m_interleaving))
+	if(renderOnOffToggleEXT("Interleaving", false, config->m_interleaving))
 	{
 		scope->SetInterleaving(config->m_interleaving);
 		refresh = true;

src/ngscopeclient/StreamBrowserDialog.h

@@ -134,7 +134,13 @@ class StreamBrowserDialog : public Dialog
 		bool alignRight,
 		ImVec4 color,
 		bool curValue);
+	bool renderToggleEXT(
+		const char* label,
+		bool alignRight,
+		ImVec4 color,
+		bool& curValue);
 	bool renderOnOffToggle(const char* label, bool alignRight, bool curValue);
+	bool renderOnOffToggleEXT(const char* label, bool alignRight, bool& curValue);
 	void renderDownloadProgress(std::shared_ptr<Instrument> inst, InstrumentChannel *chan, bool isLast);
 	void renderPsuRows(bool isVoltage, bool cc, PowerSupplyChannel* chan,const char *setValue, const char *measuredValue, bool &clicked, bool &hovered);
 	void renderAwgProperties(std::shared_ptr<FunctionGenerator> awg, FunctionGeneratorChannel* awgchan);