WIP (9)

Author: sdottaka

src/WinWebDiffLib/WebDiffWindow.hpp

@@ -307,7 +307,7 @@ class CWebDiffWindow : public IWebDiffWindow
 								}
 								else if (event == WebDiffEvent::NavigationStarting)
 								{
-									m_compareState = NOT_COMPARED;
+									SetCompareState(NOT_COMPARED);
 								}
 								else if (event == WebDiffEvent::FrameNavigationStarting)
 								{
@@ -675,7 +675,6 @@ class CWebDiffWindow : public IWebDiffWindow
 	void SetDiffOptions(const DiffOptions& diffOptions) override
 	{
 		m_diffOptions = diffOptions;
-		Recompare(nullptr);
 	}
 
 	bool GetSyncEvents() const
@@ -716,6 +715,18 @@ class CWebDiffWindow : public IWebDiffWindow
 		return m_compareState;
 	}
 
+	void SetCompareState(CompareState compareState)
+	{
+		CompareState oldCompareState = m_compareState;
+		m_compareState = compareState;
+		if (m_compareState != oldCompareState)
+		{
+			WebDiffEvent ev{ WebDiffEvent::CompareStateChanged, -1 };
+			for (const auto& listener : m_listeners)
+				listener->Invoke(ev);
+		}
+	}
+
 	int  GetDiffCount() const override
 	{
 		return static_cast<int>(m_diffInfos.size());
@@ -981,7 +992,7 @@ class CWebDiffWindow : public IWebDiffWindow
 
 	HRESULT compare(IWebDiffCallback* callback)
 	{
-		m_compareState = COMPARING;
+		SetCompareState(COMPARING);
 		ComPtr<IWebDiffCallback> callback2(callback);
 		std::shared_ptr<std::vector<std::wstring>> jsons(new std::vector<std::wstring>());
 		HRESULT hr = getDocumentsLoop(jsons,
@@ -1034,27 +1045,27 @@ class CWebDiffWindow : public IWebDiffWindow
 											Callback<IWebDiffCallback>([this, callback2](const WebDiffCallbackResult& result) -> HRESULT
 												{
 													HRESULT hr = result.errorCode;
-													m_compareState = FAILED(hr) ? NOT_COMPARED : COMPARED;
+													SetCompareState(FAILED(hr) ? NOT_COMPARED : COMPARED);
 													if (callback2)
 														return callback2->Invoke({ hr, nullptr });
 													return S_OK;
 												}).Get());
 									}
 									if (FAILED(hr))
-										m_compareState = NOT_COMPARED;
+										SetCompareState(NOT_COMPARED);
 									if (FAILED(hr) && callback2)
 										return callback2->Invoke({ hr, nullptr });
 									return S_OK;
 								}).Get());
 					}
 					if (FAILED(hr))
-						m_compareState = NOT_COMPARED;
+						SetCompareState(NOT_COMPARED);
 					if (FAILED(hr) && callback2)
 						return callback2->Invoke({ hr, nullptr });
 					return S_OK;
 				}).Get());
 		if (FAILED(hr))
-			m_compareState = NOT_COMPARED;
+			SetCompareState(NOT_COMPARED);
 		return hr;
 	}
 

src/WinWebDiffLib/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;
 };