Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: VZ <vz-github@zeitlins.org>
This commit is contained in:
Tobias Taschner
2021-02-09 22:21:24 +01:00
parent a3f85e9cd5
commit 5512089d5b
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
interface/wx/webview.h
View File

@@ -431,7 +431,8 @@ public:
@event{EVT_WEBVIEW_FULL_SCREEN_CHANGED(id, func)} @event{EVT_WEBVIEW_FULL_SCREEN_CHANGED(id, func)}
Process a @c EVT_WEBVIEW_FULL_SCREEN_CHANGED event, generated when Process a @c EVT_WEBVIEW_FULL_SCREEN_CHANGED event, generated when
the page wants to enter or leave fullscreen. Use GetInt to get the status. the page wants to enter or leave fullscreen. Use GetInt to get the status.
Currently only implemented for the edge and WebKit2GTK+ backend. Currently only implemented for the edge and WebKit2GTK+ backend
and is only available in wxWidgets 3.1.5 or later.
@endEventTable @endEventTable
@since 2.9.3 @since 2.9.3

16
src/msw/webview_edge.cpp
View File

@@ -177,19 +177,19 @@ HRESULT wxWebViewEdgeImpl::OnNavigationStarting(ICoreWebView2* WXUNUSED(sender),
return S_OK; return S_OK;
} }
HRESULT wxWebViewEdgeImpl::OnSourceChanged(ICoreWebView2 * WXUNUSED(sender), ICoreWebView2SourceChangedEventArgs * args) HRESULT wxWebViewEdgeImpl::OnSourceChanged(ICoreWebView2 * WXUNUSED(sender), ICoreWebView2SourceChangedEventArgs * args)
{ {
BOOL isNewDocument; BOOL isNewDocument;
if (SUCCEEDED(args->get_IsNewDocument(&isNewDocument)) && !isNewDocument) if (SUCCEEDED(args->get_IsNewDocument(&isNewDocument)) && !isNewDocument)
{ {
// navigation within the current document, send apropriate events // navigation within the current document, send apropriate events
wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATING, m_ctrl->GetId(), m_ctrl->GetCurrentURL(), wxString()); wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATING, m_ctrl->GetId(), m_ctrl->GetCurrentURL(), wxString());
event.SetEventObject(m_ctrl); event.SetEventObject(m_ctrl);
m_ctrl->HandleWindowEvent(event); m_ctrl->HandleWindowEvent(event);
OnNavigationCompleted(NULL, NULL); OnNavigationCompleted(NULL, NULL);
OnContentLoading(NULL, NULL); OnContentLoading(NULL, NULL);
} }
return S_OK; return S_OK;
} }
HRESULT wxWebViewEdgeImpl::OnNavigationCompleted(ICoreWebView2* WXUNUSED(sender), ICoreWebView2NavigationCompletedEventArgs* args) HRESULT wxWebViewEdgeImpl::OnNavigationCompleted(ICoreWebView2* WXUNUSED(sender), ICoreWebView2NavigationCompletedEventArgs* args)
@@ -302,7 +302,7 @@ HRESULT wxWebViewEdgeImpl::OnContentLoading(ICoreWebView2* WXUNUSED(sender), ICo
return S_OK; return S_OK;
} }
HRESULT wxWebViewEdgeImpl::OnContainsFullScreenElementChanged(ICoreWebView2* WXUNUSED(sender), IUnknown* WXUNUSED(args)) HRESULT wxWebViewEdgeImpl::OnContainsFullScreenElementChanged(ICoreWebView2* WXUNUSED(sender), IUnknown* WXUNUSED(args))
{ {
BOOL containsFullscreenEvent; BOOL containsFullscreenEvent;
HRESULT hr = m_webView->get_ContainsFullScreenElement(&containsFullscreenEvent); HRESULT hr = m_webView->get_ContainsFullScreenElement(&containsFullscreenEvent);
@@ -310,12 +310,12 @@ HRESULT wxWebViewEdgeImpl::OnContainsFullScreenElementChanged(ICoreWebView2* WXU
return hr; return hr;
wxWebViewEvent event(wxEVT_WEBVIEW_FULLSCREEN_CHANGED, m_ctrl->GetId(), wxWebViewEvent event(wxEVT_WEBVIEW_FULLSCREEN_CHANGED, m_ctrl->GetId(),
m_ctrl->GetCurrentURL(), ""); m_ctrl->GetCurrentURL(), wxString());
event.SetEventObject(m_ctrl); event.SetEventObject(m_ctrl);
event.SetInt(containsFullscreenEvent); event.SetInt(containsFullscreenEvent);
m_ctrl->HandleWindowEvent(event); m_ctrl->HandleWindowEvent(event);
return S_OK; return S_OK;
} }
HRESULT wxWebViewEdgeImpl::OnWebViewCreated(HRESULT result, ICoreWebView2Controller* webViewController) HRESULT wxWebViewEdgeImpl::OnWebViewCreated(HRESULT result, ICoreWebView2Controller* webViewController)