Fix the issue where the caption set in the header bar is restored whe…

…n the window is resized.
WinMerge · Nov 5, 2023 · 14e9924 · 14e9924
1 parent 3ffacf8
commit 14e9924
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/Src/HexMergeDoc.h b/Src/HexMergeDoc.h
@@ -85,7 +85,14 @@ class CHexMergeDoc : public CDocument, public IMergeDoc
 	void ChangeFile(int nBuffer, const String& path, int nLineIndex = -1);
 	void CheckFileChanged(void) override;
 	String GetDescription(int pane) const override { return m_strDesc[pane]; };
-	void SetDescription(int pane, const String& strDesc) {  m_strDesc[pane] = strDesc; };
+	void SetDescription(int pane, const String& strDesc) {
+		if (m_strDesc[pane] != strDesc)
+		{
+			m_strDesc[pane] = strDesc;
+			if (m_nBufferType[pane] == BUFFERTYPE::NORMAL)
+				m_nBufferType[pane] = BUFFERTYPE::NORMAL_NAMED;
+		}
+	}
 	void SaveAs(int nBuffer, bool packing = true) { DoFileSaveAs(nBuffer, packing); }
 	String GetSaveAsPath() const { return m_strSaveAsPath; }
 	void SetSaveAsPath(const String& strSaveAsPath) { m_strSaveAsPath = strSaveAsPath; }

diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
@@ -538,8 +538,13 @@ int CImgMergeFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 			m_pImgMergeWindow->SetActivePane(pane);
 	});
 	m_wndFilePathBar.SetOnCaptionChangedCallback([&](int pane, const String& sText) {
-		m_strDesc[pane] = sText;
-		UpdateHeaderPath(pane);
+		if (m_strDesc[pane] != sText)
+		{
+			m_strDesc[pane] = sText;
+			if (m_nBufferType[pane] == BUFFERTYPE::NORMAL)
+				m_nBufferType[pane] = BUFFERTYPE::NORMAL_NAMED;
+			UpdateHeaderPath(pane);
+		}
 	});
 	m_wndFilePathBar.SetOnFileSelectedCallback([&](int pane, const String& sFilepath) {
 		ChangeFile(pane, sFilepath);

diff --git a/Src/MergeDoc.h b/Src/MergeDoc.h
@@ -252,7 +252,14 @@ class CMergeDoc : public CDocument, public IMergeDoc
 	bool HasSyncPoints();
 	std::vector<std::vector<int> > GetSyncPointList();
 	String GetDescription(int pane) const override { return m_strDesc[pane]; }
-	void SetDescription(int pane, const String& sText) { m_strDesc[pane] = sText; }
+	void SetDescription(int pane, const String& sText) {
+		if (m_strDesc[pane] != sText)
+		{
+			m_strDesc[pane] = sText;
+			if (m_nBufferType[pane] == BUFFERTYPE::NORMAL)
+				m_nBufferType[pane] = BUFFERTYPE::NORMAL_NAMED;
+		}
+	}
 
 	// Overrides
 	// ClassWizard generated virtual function overrides

diff --git a/Src/WebPageDiffFrm.cpp b/Src/WebPageDiffFrm.cpp
@@ -520,8 +520,13 @@ int CWebPageDiffFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 			m_pWebDiffWindow->SetActivePane(pane);
 	});
 	m_wndFilePathBar.SetOnCaptionChangedCallback([&](int pane, const String& sText) {
-		m_strDesc[pane] = sText;
-		UpdateHeaderPath(pane);
+		if (m_strDesc[pane] != sText)
+		{
+			m_strDesc[pane] = sText;
+			if (m_nBufferType[pane] == BUFFERTYPE::NORMAL)
+				m_nBufferType[pane] = BUFFERTYPE::NORMAL_NAMED;
+			UpdateHeaderPath(pane);
+		}
 	});
 
 	// Merge frame also has a dockable bar at the very left