Introduce a flat status bar without separator lines. (WinMerge#2377) (2)

sdottaka · sdottaka · commit 5db5405bf145 · 2024-07-13T21:02:45.000+09:00
diff --git a/Src/BasicFlatStatusBar.cpp b/Src/BasicFlatStatusBar.cpp
@@ -85,7 +85,11 @@ void CBasicFlatStatusBar::OnPaint()
 			CRect rcText = rcPart;
 			rcText.left += radius;
 			CString text = ctrl.GetText(i);
-			text.Replace(_T("\t"), _T("  "));
+			if (text.Find('\t') >= 0)
+			{
+				text.Trim();
+				text.Replace(_T("\t"), _T("  "));
+			}
 			dc.DrawText(text, &rcText, DT_LEFT | DT_VCENTER | DT_SINGLELINE);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,11 @@ void CBasicFlatStatusBar::OnPaint()`
`85`	`85`	`CRect rcText = rcPart;`
`86`	`86`	`rcText.left += radius;`
`87`	`87`	`CString text = ctrl.GetText(i);`
`88`		`- text.Replace(_T("\t"), _T(" "));`
	`88`	`+ if (text.Find('\t') >= 0)`
	`89`	`+ {`
	`90`	`+ text.Trim();`
	`91`	`+ text.Replace(_T("\t"), _T(" "));`
	`92`	`+ }`
`89`	`93`	`dc.DrawText(text, &rcText, DT_LEFT \| DT_VCENTER \| DT_SINGLELINE);`
`90`	`94`	`}`
`91`	`95`	`}`