Skip to content

Commit ec65e03

Browse files
committed
fix: the compatible problem for earlier cef version
1 parent c79fb7f commit ec65e03

File tree

3 files changed

+21
-10
lines changed

3 files changed

+21
-10
lines changed

include/CefViewBrowserClient.h

+3
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@ class CefViewBrowserClient
198198
const CefString& title,
199199
const CefString& default_file_path,
200200
const std::vector<CefString>& accept_filters,
201+
#if CEF_VERSION_MAJOR < 102
202+
int selected_accept_filter,
203+
#endif
201204
CefRefPtr<CefFileDialogCallback> callback) override;
202205
#pragma endregion
203206

include/CefViewBrowserClientDelegate.h

+6-9
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,16 @@ class CefViewBrowserClientDelegateInterface
7272
const CefString& title,
7373
const CefString& default_file_path,
7474
const std::vector<CefString>& accept_filters,
75+
#if CEF_VERSION_MAJOR < 102
76+
int selected_accept_filter,
77+
#endif
7578
CefRefPtr<CefFileDialogCallback> callback)
7679
{
7780
return false;
7881
};
7982
#pragma endregion
8083

81-
// display handler
84+
// display handler
8285
#pragma region DisplayHandler
8386
virtual void addressChanged(CefRefPtr<CefBrowser>& browser, int64_t frameId, const std::string& url) = 0;
8487

@@ -186,19 +189,13 @@ class CefViewBrowserClientDelegateInterface
186189

187190
// Off screen rendering
188191
#pragma region RenderHandler
189-
virtual bool getRootScreenRect(CefRefPtr<CefBrowser> browser, CefRect& rect)
190-
{
191-
return false;
192-
}
192+
virtual bool getRootScreenRect(CefRefPtr<CefBrowser> browser, CefRect& rect) { return false; }
193193
virtual void getViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) {}
194194
virtual bool getScreenPoint(CefRefPtr<CefBrowser> browser, int viewX, int viewY, int& screenX, int& screenY)
195195
{
196196
return false;
197197
}
198-
virtual bool getScreenInfo(CefRefPtr<CefBrowser> browser, CefScreenInfo& screen_info)
199-
{
200-
return false;
201-
}
198+
virtual bool getScreenInfo(CefRefPtr<CefBrowser> browser, CefScreenInfo& screen_info) { return false; }
202199
virtual void onPopupShow(CefRefPtr<CefBrowser> browser, bool show) {}
203200
virtual void onPopupSize(CefRefPtr<CefBrowser> browser, const CefRect& rect) {}
204201
virtual void onPaint(CefRefPtr<CefBrowser> browser,

src/CefView/CefBrowserApp/CefViewBrowserClient_DialogHandler.cpp

+12-1
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,22 @@ CefViewBrowserClient::OnFileDialog(CefRefPtr<CefBrowser> browser,
2424
const CefString& title,
2525
const CefString& default_file_path,
2626
const std::vector<CefString>& accept_filters,
27+
#if CEF_VERSION_MAJOR < 102
28+
int selected_accept_filter,
29+
#endif
2730
CefRefPtr<CefFileDialogCallback> callback)
2831
{
2932
auto delegate = client_delegate_.lock();
3033
if (delegate)
31-
return delegate->onFileDialog(browser, mode, title, default_file_path, accept_filters, callback);
34+
return delegate->onFileDialog(browser,
35+
mode,
36+
title,
37+
default_file_path,
38+
accept_filters,
39+
#if CEF_VERSION_MAJOR < 102
40+
selected_accept_filter,
41+
#endif,
42+
callback);
3243

3344
return false;
3445
}

0 commit comments

Comments
 (0)