WIP

WinMerge · Nov 19, 2023 · c48e17e · c48e17e
1 parent de0401e
commit c48e17e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/Externals/winwebdiff b/Externals/winwebdiff
diff --git a/Src/MergeFrameCommon.cpp b/Src/MergeFrameCommon.cpp
@@ -88,7 +88,7 @@ void CMergeFrameCommon::RemoveBarBorder()
  */
 void CMergeFrameCommon::SetLastCompareResult(int nResult)
 {
-	HICON hReplace = (nResult == 0) ? m_hIdentical : m_hDifferent;
+	HICON hReplace = (nResult == 0) ? m_hIdentical : ((nResult < 0) ? nullptr : m_hDifferent);
 
 	if (m_hCurrent != hReplace)
 	{

diff --git a/Src/WebPageDiffFrm.cpp b/Src/WebPageDiffFrm.cpp
@@ -323,6 +323,9 @@ void CWebPageDiffFrame::OnWebDiffEvent(const WebDiffEvent& event)
 {
 	switch (event.type)
 	{
+	case WebDiffEvent::NavigationStarting:
+		UpdateLastCompareResult();
+		break;
 	case WebDiffEvent::SourceChanged:
 	case WebDiffEvent::TabChanged:
 	{
@@ -877,7 +880,7 @@ int CWebPageDiffFrame::UpdateLastCompareResult()
 	int result = -1;
 	if (m_bCompareCompleted)
 	{
-		result = m_pWebDiffWindow->GetDiffCount() > 0 ? 1 : 0;
+		result = (m_pWebDiffWindow->GetCompareState() == IWebDiffWindow::COMPARED) ? (m_pWebDiffWindow->GetDiffCount() > 0 ? 1 : 0) : -1;
 		SetLastCompareResult(result);
 	}
 	return result;

diff --git a/Src/WinWebDiffLib.h b/Src/WinWebDiffLib.h
@@ -6,7 +6,7 @@
 
 struct WebDiffEvent
 {
-	enum EVENT_TYPE { ZoomFactorChanged, NewWindowRequested, WindowCloseRequested, NavigationStarting, FrameNavigationStarting, HistoryChanged, SourceChanged, DocumentTitleChanged, NavigationCompleted, FrameNavigationCompleted, WebMessageReceived, FrameWebMessageReceived, TabChanged, HSCROLL, VSCROLL };
+	enum EVENT_TYPE { ZoomFactorChanged, NewWindowRequested, WindowCloseRequested, NavigationStarting, FrameNavigationStarting, HistoryChanged, SourceChanged, DocumentTitleChanged, NavigationCompleted, FrameNavigationCompleted, WebMessageReceived, FrameWebMessageReceived, TabChanged, HSCROLL, VSCROLL, CompareStateChanged };
 	EVENT_TYPE type;
 	int pane;
 };
@@ -62,6 +62,12 @@ struct IWebDiffWindow
 		EVENT_CLICK         = ( 1 << 1 ),
 		EVENT_INPUT         = ( 1 << 2 ),
 	};
+	enum CompareState
+	{
+		NOT_COMPARED,
+		COMPARING,
+		COMPARED,
+	};
 	struct DiffOptions
 	{
 		enum DiffAlgorithm {
@@ -183,6 +189,7 @@ struct IWebDiffWindow
 	virtual void SetSyncEventFlags(unsigned flags) = 0;
 	virtual bool GetSyncEventFlag(EventType event) const = 0;
 	virtual void SetSyncEventFlag(EventType event, bool flag) = 0;
+	virtual CompareState GetCompareState() const = 0;
 };
 
 extern "C"
+123 −89		src/WinWebDiffLib/WebDiffWindow.hpp
+8 −1		src/WinWebDiffLib/WinWebDiffLib.h