Merged code from upstream to open properties on double click + close nodes by default.

Author: Frederic Borry

src/ngscopeclient/StreamBrowserDialog.cpp

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -1714,11 +1714,9 @@ void StreamBrowserDialog::renderChannelNode(shared_ptr<Instrument> instrument, s
 	auto awgchan = dynamic_cast<FunctionGeneratorChannel *>(channel);
 	auto dmmchan = dynamic_cast<MultimeterChannel *>(channel);
 	bool renderProps = false;
-	bool isDigital = false;
 	if (scopechan)
 	{
 		renderProps = scopechan->IsEnabled();
-		isDigital = scopechan->GetType(0) == Stream::STREAM_TYPE_DIGITAL;
 	}
 	else if(awg && awgchan)
 	{
@@ -1734,19 +1732,32 @@ void StreamBrowserDialog::renderChannelNode(shared_ptr<Instrument> instrument, s
 	if(!hasChildren)
 		flags |= ImGuiTreeNodeFlags_Leaf;
 
-	//Collapse all scope channel nodes by default to reduce clutter
-	if(isDigital || scopechan)
-	{}
-
-	else
-		flags |= ImGuiTreeNodeFlags_DefaultOpen;
+	flags |= ImGuiTreeNodeFlags_OpenOnArrow;
 
 	bool open = ImGui::TreeNodeEx(
 		channel->GetDisplayName().c_str(),
 		flags);
 	if (channel->m_displaycolor != "")
 		ImGui::PopStyleColor();
 
+	//Open properties dialog on double click
+	if(ImGui::IsItemHovered())
+	{
+		if(ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left))
+		{
+			if(scopechan)
+				m_parent->ShowChannelProperties(scopechan);
+			else if(psuchan)
+				m_parent->ShowInstrumentProperties(psu);
+			else if(awgchan)
+				m_parent->ShowInstrumentProperties(awg);
+			else
+				LogWarning("Don't know how to open channel properties yet\n");
+		}
+
+		m_parent->AddStatusHelp("mouse_lmb_double", "Open properties");
+	}
+
 	//Single stream: drag the stream not the channel
 	if(singleStream)
 	{
@@ -1911,7 +1922,7 @@ void StreamBrowserDialog::renderChannelNode(shared_ptr<Instrument> instrument, s
 			for(size_t j=0; j<streamCount; j++)
 			{
 				// Iterate on each stream
-				renderStreamNode(instrument,channel,j,!singleStream,renderProps,(j==(streamCount-1)));
+				renderStreamNode(instrument,channel,j,!singleStream,renderProps);
 			}
 		}
 		ImGui::PopID();
@@ -2006,9 +2017,8 @@ void StreamBrowserDialog::renderChannelProperties(std::shared_ptr<Oscilloscope>
    @param streamIndex the index of the stream to render
    @param renderName true if the name of the stream should be rendred as a selectable item
    @param renderProps true if a properties block should be rendered for this stream
-   @param isLast true if this is the last stream of the channel
  */
-void StreamBrowserDialog::renderStreamNode(shared_ptr<Instrument> instrument, InstrumentChannel* channel, size_t streamIndex, bool renderName, bool renderProps, bool isLast)
+void StreamBrowserDialog::renderStreamNode(shared_ptr<Instrument> instrument, InstrumentChannel* channel, size_t streamIndex, bool renderName, bool renderProps)
 {
 	auto scope = std::dynamic_pointer_cast<Oscilloscope>(instrument);
 	auto scopechan = dynamic_cast<OscilloscopeChannel *>(channel);
@@ -2020,7 +2030,6 @@ void StreamBrowserDialog::renderStreamNode(shared_ptr<Instrument> instrument, In
 	if (renderName)
 	{
 		ImGui::Selectable(channel->GetStreamName(streamIndex).c_str());
-
 		StreamDescriptor s(channel, streamIndex);
 		if(ImGui::BeginDragDropSource())
 		{
@@ -2044,7 +2053,7 @@ void StreamBrowserDialog::renderStreamNode(shared_ptr<Instrument> instrument, In
 	if(renderProps && scopechan)
 	{
 		// If no properties are available for this stream, only show a "Properties" link if it is the last stream of the channel/filter
-		bool hasProps = isLast;
+		bool hasProps = false;
 		switch (type)
 		{
 			case Stream::STREAM_TYPE_ANALOG:
@@ -2110,9 +2119,6 @@ void StreamBrowserDialog::renderStreamNode(shared_ptr<Instrument> instrument, In
 					}
 					//fall through
 				default:
-					{
-						ImGui::TextUnformatted("No properties");
-					}
 					break;
 			}
 			EndBlock();
@@ -2136,14 +2142,22 @@ void StreamBrowserDialog::renderFilterNode(Filter* filter)
 		ImGui::PushStyleColor(ImGuiCol_Text, ColorFromString(filter->m_displaycolor));
 
 	//Don't expand filters with a single stream by default
-	int flags = 0;
+	int flags = ImGuiTreeNodeFlags_OpenOnArrow;
 	if(!singleStream)
 		flags |= ImGuiTreeNodeFlags_DefaultOpen;
 
 	bool open = ImGui::TreeNodeEx(filter->GetDisplayName().c_str(), flags);
 	if (filter->m_displaycolor != "")
 		ImGui::PopStyleColor();
 
+	//Open properties dialog on double click
+	if(ImGui::IsItemHovered())
+	{
+		if(ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left))
+			m_parent->ShowChannelProperties(filter);
+		m_parent->AddStatusHelp("mouse_lmb_double", "Open properties");
+	}
+
 	//Single stream: drag the stream not the filter
 	if(singleStream)
 	{
@@ -2178,10 +2192,8 @@ void StreamBrowserDialog::renderFilterNode(Filter* filter)
 
 		size_t streamCount = filter->GetStreamCount();
 		for(size_t j=0; j<streamCount; j++)
-		{
-			// Iterate on each stream
-			renderStreamNode(nullptr,filter,j,!singleStream,true,(j==(streamCount-1)));
-		}
+			renderStreamNode(nullptr,filter,j,!singleStream,true);
+
 		ImGui::PopID();
 	}
 

src/ngscopeclient/StreamBrowserDialog.h

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -179,7 +179,7 @@ class StreamBrowserDialog : public Dialog
 	void renderChannelProperties(std::shared_ptr<Oscilloscope> scope, OscilloscopeChannel* scopechan, size_t channelIndex, std::shared_ptr<OscilloscopeState> scopeState);
 
 	// Rendering of a stream node
-	void renderStreamNode(std::shared_ptr<Instrument> instrument, InstrumentChannel* channel, size_t streamIndex, bool renderName, bool renderProps, bool isLast);
+	void renderStreamNode(std::shared_ptr<Instrument> instrument, InstrumentChannel* channel, size_t streamIndex, bool renderName, bool renderProps);
 
 	// Rendering of an Filter node
 	void renderFilterNode(Filter* filter);