Removed all calls to ImFont::CalcTextSizeA() and replaced with ImGui::CalcTextSize(). Fixes #851.

Author: azonenberg

src/ngscopeclient/FilterGraphEditor.cpp

@@ -739,9 +739,8 @@ void FilterGraphEditor::DoNodeForGroupInputs(shared_ptr<FilterGraphGroup> group)
 	auto gpos = ax::NodeEditor::GetNodePosition(gid);
 
 	//Figure out how big the port text is
-	auto textfont = ImGui::GetFont();
 	float oportmax = 1;
-	float iportmax = textfont->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, 0, "‣").x;
+	float iportmax = ImGui::CalcTextSize("‣").x;
 	vector<string> onames;
 	for(auto it : group->m_hierInputMap)
 	{
@@ -759,7 +758,7 @@ void FilterGraphEditor::DoNodeForGroupInputs(shared_ptr<FilterGraphGroup> group)
 		auto name = sinkname + " ‣";
 		onames.push_back(name);
 		oportmax = max(oportmax,
-			textfont->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, 0, name.c_str()).x +
+			ImGui::CalcTextSize(name.c_str()).x +
 			ImGui::GetFontSize() * 2);
 	}
 	float nodewidth = oportmax + iportmax + 1*ImGui::GetStyle().ItemSpacing.x;
@@ -848,17 +847,16 @@ void FilterGraphEditor::DoNodeForGroupOutputs(shared_ptr<FilterGraphGroup> group
 	auto gsz = ax::NodeEditor::GetNodeSize(gid);
 
 	//Figure out how big the port text is
-	auto textfont = ImGui::GetFont();
 	float oportmax = 1;
-	float iportmax = textfont->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, 0, "‣").x;
+	float iportmax = ImGui::CalcTextSize("‣").x;
 	vector<string> onames;
 	for(auto it : group->m_hierOutputMap)
 	{
 		auto stream = it.first;
 
 		auto name = stream.GetName() + " ‣";
 		onames.push_back(name);
-		oportmax = max(oportmax, textfont->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, 0, name.c_str()).x);
+		oportmax = max(oportmax, ImGui::CalcTextSize(name.c_str()).x);
 	}
 	float nodewidth = oportmax + iportmax + 3*ImGui::GetStyle().ItemSpacing.x;
 
@@ -1886,7 +1884,7 @@ void FilterGraphEditor::DoNodeForTrigger(Trigger* trig)
 		headerText = trig->GetScope()->m_nickname + ": " + headerText;
 
 	//Figure out how big the header text is and reserve space for it
-	auto headerSize = headerfont.first->CalcTextSizeA(headerfontsize, FLT_MAX, 0, headerText.c_str());
+	auto headerSize = CalcTextSizeForFont(headerfont, headerText.c_str());
 	float nodewidth = max(15*tsize, headerSize.x);
 	ImGui::Dummy(ImVec2(nodewidth, headerheight));
 
@@ -1995,7 +1993,7 @@ void FilterGraphEditor::DoNodeForChannel(
 		headerText = inst->m_nickname + ": " + headerText;
 
 	//Figure out how big the header text is
-	auto headerSize = headerfont.first->CalcTextSizeA(headerfontsize, FLT_MAX, 0, headerText.c_str());
+	auto headerSize = CalcTextSizeForFont(headerfont, headerText.c_str());
 
 	//Format block type early, even though it's not drawn until later
 	//so that we know how much space to allocate
@@ -2021,7 +2019,7 @@ void FilterGraphEditor::DoNodeForChannel(
 			blocktype = "Hardware input";
 	}
 	ImVec2 iconsize(ImGui::GetFontSize() * 6, ImGui::GetFontSize() * 3);
-	auto captionsize = textfont.first->CalcTextSizeA(textfontsize, FLT_MAX, 0, blocktype.c_str());
+	auto captionsize = CalcTextSizeForFont(textfont, blocktype.c_str());
 
 	//Reserve space for the center icon and node type caption
 	float iconwidth = max(iconsize.x, captionsize.x);
@@ -2035,13 +2033,13 @@ void FilterGraphEditor::DoNodeForChannel(
 	{
 		auto name = string("‣ ") + channel->GetInputName(i);
 		inames.push_back(name);
-		iportmax = max(iportmax, textfont.first->CalcTextSizeA(textfontsize, FLT_MAX, 0, name.c_str()).x);
+		iportmax = max(iportmax, CalcTextSizeForFont(textfont, name.c_str()).x);
 	}
 	for(size_t i=0; i<channel->GetStreamCount(); i++)
 	{
 		auto name = channel->GetStreamName(i) + " ‣";
 		onames.push_back(name);
-		oportmax = max(oportmax, textfont.first->CalcTextSizeA(textfontsize, FLT_MAX, 0, name.c_str()).x);
+		oportmax = max(oportmax, CalcTextSizeForFont(textfont, name.c_str()).x);
 	}
 	float colswidth = iportmax + oportmax + iconwidth;
 	float nodewidth = max(colswidth, headerSize.x) + 3*ImGui::GetStyle().ItemSpacing.x;
@@ -2161,7 +2159,7 @@ void FilterGraphEditor::DoNodeForChannel(
 	if(runtime > 0)
 	{
 		auto runtimeText = fs.PrettyPrint(runtime, 3);
-		auto runtimeSize = headerfont.first->CalcTextSizeA(headerfontsize, FLT_MAX, 0, runtimeText.c_str());
+		auto runtimeSize = CalcTextSizeForFont(headerfont, runtimeText.c_str());
 
 		auto timebgColor = ColorFromString("#404040");
 		auto timeTextColor = ColorFromString("#ffffff");

src/ngscopeclient/FontManager.cpp

@@ -136,3 +136,18 @@ void FontManager::AddFontDescriptions(PreferenceCategory& cat, set<FontDescripti
 		}
 	}
 }
+
+/**
+	@brief Wrapper around ImGui::CalcTextSize that uses an explicit font
+ */
+ImVec2 CalcTextSizeForFont(
+	FontWithSize font,
+	const char* text,
+	bool hide_text_after_double_hash,
+	float wrap_width)
+{
+	ImGui::PushFont(font.first, font.second);
+	ImVec2 size = ImGui::CalcTextSize(text, nullptr, hide_text_after_double_hash, wrap_width);
+	ImGui::PopFont();
+	return size;
+}

src/ngscopeclient/FontManager.h

@@ -66,4 +66,10 @@ class FontManager
 	std::map<FontDescription, ImFont*> m_fonts;
 };
 
+ImVec2 CalcTextSizeForFont(
+	FontWithSize font,
+	const char* text,
+	bool hide_text_after_double_hash = false,
+	float wrap_width = -1.0f);
+
 #endif

src/ngscopeclient/ProtocolAnalyzerDialog.cpp

@@ -566,6 +566,8 @@ void ProtocolAnalyzerDialog::DoImageColumn(Packet* pack, vector<RowData>& rows,
  */
 void ProtocolAnalyzerDialog::DoDataColumn(Packet* pack, FontWithSize dataFont, vector<RowData>& rows, size_t nrow)
 {
+	ImGui::PushFont(dataFont.first, dataFont.second);
+
 	//When drawing the first cell, figure out dimensions for subsequent stuff
 	if(m_firstDataBlockOfFrame)
 	{
@@ -575,7 +577,7 @@ void ProtocolAnalyzerDialog::DoDataColumn(Packet* pack, FontWithSize dataFont, v
 		//Figure out how many characters of text we can fit in the data region
 		//This assumes data font is fixed width, may break if user chooses variable width.
 		//But hex dumps with variable width will look horrible anyway so that's probably not a problem?
-		auto fontwidth = dataFont.first->CalcTextSizeA(dataFont.second, FLT_MAX, -1, "W").x;
+		auto fontwidth = ImGui::CalcTextSize("W").x;
 		size_t charsPerLine = floor(xsize / fontwidth);
 
 		//TODO: use 2-nibble address if packet has <256 bytes of data
@@ -604,7 +606,10 @@ void ProtocolAnalyzerDialog::DoDataColumn(Packet* pack, FontWithSize dataFont, v
 		}
 
 		if(m_bytesPerLine <= 0)
+		{
+			ImGui::PopFont();
 			return;
+		}
 	}
 
 	string firstLine;
@@ -615,7 +620,6 @@ void ProtocolAnalyzerDialog::DoDataColumn(Packet* pack, FontWithSize dataFont, v
 	string lineAscii;
 
 	//Create the tree node early - before we've even rendered any data - so we know the open / closed state
-	ImGui::PushFont(dataFont.first, dataFont.second);
 	bool open = false;
 	if(!bytes.empty())
 	{

src/ngscopeclient/WaveformArea.cpp

@@ -821,7 +821,7 @@ void WaveformArea::RenderYAxisCursors(ImVec2 pos, ImVec2 size, float yAxisWidth)
 		//Text
 		//Anchor bottom left at the cursor
 		auto str = string("Y1: ") + m_yAxisUnit.PrettyPrint(m_yAxisCursorPositions[0]);
-		auto tsize = font.first->CalcTextSizeA(font.second, FLT_MAX, 0.0, str.c_str());
+		auto tsize = CalcTextSizeForFont(font, str.c_str());
 		float padding = 2;
 		float wrounding = 2;
 		float textTop = ypos0 - (3*padding + tsize.y);
@@ -849,7 +849,7 @@ void WaveformArea::RenderYAxisCursors(ImVec2 pos, ImVec2 size, float yAxisWidth)
 				"ΔY = " + m_yAxisUnit.PrettyPrint(delta);
 
 			//Text
-			tsize = font.first->CalcTextSizeA(font.second, FLT_MAX, 0.0, str.c_str());
+			tsize = CalcTextSizeForFont(font, str.c_str());
 			textTop = ypos1 - (3*padding + tsize.y);
 			textLeft = plotRight - (2*padding + tsize.x);
 			list->AddRectFilled(
@@ -869,7 +869,7 @@ void WaveformArea::RenderYAxisCursors(ImVec2 pos, ImVec2 size, float yAxisWidth)
 		else if(m_dragState == DRAG_STATE_Y_CURSOR1)
 			m_dragState = DRAG_STATE_NONE;
 
-		//TODO: text for value readouts, in-band power, etc
+		//TODO: text for value readouts, in-band power, etc?
 	}
 	ImGui::EndChild();
 
@@ -1450,7 +1450,7 @@ void WaveformArea::RenderSpectrumPeaks(ImDrawList* list, shared_ptr<DisplayedCha
 			"X = " + stream.GetXAxisUnits().PrettyPrint(label.m_peakXpos) + "\n" +
 			"Y = " + stream.GetYAxisUnits().PrettyPrint(label.m_peakYpos) + "\n" +
 			"FWHM = " + stream.GetXAxisUnits().PrettyPrint(label.m_fwhm);
-		auto textSizePixels = font.first->CalcTextSizeA(font.second, FLT_MAX, 0, str.c_str());
+		auto textSizePixels = CalcTextSizeForFont(font, str.c_str());
 
 		//Create rectangle for box around centroid
 		float padding = 2;
@@ -1798,7 +1798,7 @@ void WaveformArea::RenderComplexSignal(
 	if(available_width > 15)
 	{
 		auto font = m_parent->GetFontPref("Appearance.Decodes.protocol_font");
-		auto textsize = font.first->CalcTextSizeA(font.second, FLT_MAX, 0, str.c_str());
+		auto textsize = CalcTextSizeForFont(font, str.c_str());
 
 		//Minimum width (if outline ends up being smaller than this, just fill)
 		float min_width = 40;
@@ -1874,7 +1874,7 @@ void WaveformArea::RenderComplexSignal(
 					else
 						str_render = "..." + str.substr(str.length() - len - 1);
 
-					textsize = font.first->CalcTextSizeA(font.second, FLT_MAX, 0, str_render.c_str());
+					textsize = CalcTextSizeForFont(font, str_render.c_str());
 					if(textsize.x < available_width)
 					{
 						//Re-center text in available space
@@ -2702,7 +2702,7 @@ void WaveformArea::RenderYAxis(ImVec2 size, map<float, float>& gridmap, float vb
 		float vhi = YPositionToYAxisUnits(it.second + 0.5);
 		auto label = m_yAxisUnit.PrettyPrintRange(vlo, vhi, vbot, vtop);
 
-		auto tsize = font.first->CalcTextSizeA(font.second, FLT_MAX, 0, label.c_str());
+		auto tsize = CalcTextSizeForFont(font, label.c_str());
 		float y = it.second - tsize.y/2;
 		if(y > ybot)
 			continue;
@@ -2994,11 +2994,7 @@ void WaveformArea::CheckForScaleMismatch(ImVec2 start, ImVec2 size)
 
 	//Draw background for text
 	float wrapWidth = 40 * fontHeight;
-	auto textsize = font.first->CalcTextSizeA(
-		fontHeight,
-		FLT_MAX,
-		wrapWidth,
-		str.c_str());
+	auto textsize = CalcTextSizeForFont(font, str.c_str(), false, wrapWidth);
 	float padding = 5;
 	float wrounding = 2;
 	list->AddRectFilled(
@@ -3623,11 +3619,7 @@ void WaveformArea::DrawDropRangeMismatchMessage(
 
 		//Draw background for text
 		float wrapWidth = 40 * fontHeight;
-		auto textsize = font.first->CalcTextSizeA(
-			fontHeight,
-			FLT_MAX,
-			wrapWidth,
-			str.c_str());
+		auto textsize = CalcTextSizeForFont(font, str.c_str(), false, wrapWidth);
 		float padding = 5;
 		float wrounding = 2;
 		list->AddRectFilled(

src/ngscopeclient/WaveformGroup.cpp

@@ -523,7 +523,7 @@ void WaveformGroup::RenderMarkers(ImVec2 pos, ImVec2 size)
 			//Text
 			//Anchor bottom right at the cursor
 			auto str = m.m_name + ": " + m_xAxisUnit.PrettyPrint(m.m_offset);
-			auto tsize = font.first->CalcTextSizeA(font.second, FLT_MAX, 0.0, str.c_str());
+			auto tsize = CalcTextSizeForFont(font, str.c_str());
 			float padding = 2;
 			float wrounding = 2;
 			float textTop = pos.y + m_timelineHeight - (padding + tsize.y);
@@ -683,7 +683,7 @@ void WaveformGroup::RenderXAxisCursors(ImVec2 pos, ImVec2 size)
 		//Text
 		//Anchor bottom right at the cursor
 		auto str = string("X1: ") + m_xAxisUnit.PrettyPrint(m_xAxisCursorPositions[0]);
-		auto tsize = font.first->CalcTextSizeA(font.second, FLT_MAX, 0.0, str.c_str());
+		auto tsize = CalcTextSizeForFont(font, str.c_str());
 		float padding = 2;
 		float wrounding = 2;
 		float textTop = pos.y + m_timelineHeight - (padding + tsize.y);
@@ -714,7 +714,7 @@ void WaveformGroup::RenderXAxisCursors(ImVec2 pos, ImVec2 size)
 				str += string(" (") + hz.PrettyPrint(FS_PER_SECOND / delta) + ")";
 
 			//Text
-			tsize = font.first->CalcTextSizeA(font.second, FLT_MAX, 0.0, str.c_str());
+			tsize = CalcTextSizeForFont(font, str.c_str());
 			textTop = pos.y + m_timelineHeight - (padding + tsize.y);
 			list->AddRectFilled(
 				ImVec2(xpos1 + 1, textTop - padding ),