Skip to content

Commit

Permalink
Disable WebView2 mini menu ("OOUI")
Browse files Browse the repository at this point in the history
  • Loading branch information
JensMertelmeyer committed Apr 25, 2022
1 parent d30479e commit 3a56f1c
Showing 1 changed file with 24 additions and 20 deletions.
44 changes: 24 additions & 20 deletions src/webview/webview2/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,26 +94,30 @@ impl InnerWebView {

CreateCoreWebView2EnvironmentCompletedHandler::wait_for_async_operation(
Box::new(move |environmentcreatedhandler| unsafe {
if let Some(data_directory) = data_directory {
// If we have a custom data_directory, we need to use a call to `CreateCoreWebView2EnvironmentWithOptions`
// instead of the much simpler `CreateCoreWebView2Environment`.
let options: ICoreWebView2EnvironmentOptions =
CoreWebView2EnvironmentOptions::default().into();
let data_directory = pwstr_from_str(&data_directory);
let result = CreateCoreWebView2EnvironmentWithOptions(
PWSTR::default(),
data_directory,
options,
environmentcreatedhandler,
)
.map_err(webview2_com::Error::WindowsError);
let _ = take_pwstr(data_directory);

return result;
}

CreateCoreWebView2Environment(environmentcreatedhandler)
.map_err(webview2_com::Error::WindowsError)
let options: ICoreWebView2EnvironmentOptions;
options = CoreWebView2EnvironmentOptions::default().into();

// remove "mini menu" - See https://github.com/tauri-apps/wry/issues/535
let additional_arguments = pwstr_from_str("--disable-features=msWebOOUI,msPdfOOUI");
let _ = options.SetAdditionalBrowserArguments(additional_arguments);

// if data_directory is None, we set it to a null PWSTR
let data_directory: PWSTR =
match data_directory {
Some(s) => pwstr_from_str(&s),
None => PWSTR::default(),
};

let result = CreateCoreWebView2EnvironmentWithOptions(
PWSTR::default(),
data_directory,
options,
environmentcreatedhandler,
)
.map_err(webview2_com::Error::WindowsError);
let _ = take_pwstr(data_directory);

return result;
}),
Box::new(move |error_code, environment| {
error_code?;
Expand Down

0 comments on commit 3a56f1c

Please sign in to comment.