Skip to content

Commit

Permalink
fix: fix incorrect label passed to ipc protocol (#11268)
Browse files Browse the repository at this point in the history
* fix: fix incorrect label passed to `ipc` protocol

closes #11171

* update lock file

* Update .changes/incorrect-label-linux-command.md

Co-authored-by: Lucas Fernandes Nogueira <lucas@tauri.app>

* Update .changes/incorrect-label-linux-protocol.md

Co-authored-by: Lucas Fernandes Nogueira <lucas@tauri.app>

* clippy

* try wry from dev

* fix macos build

* fix ios build

* update wry

* Update .changes/incorrect-label-linux-command.md

* wry 0.46

---------

Co-authored-by: Lucas Fernandes Nogueira <lucas@tauri.app>
  • Loading branch information
amrbashir and lucasfernog authored Oct 12, 2024
1 parent 069c05e commit 2d087ee
Show file tree
Hide file tree
Showing 13 changed files with 257 additions and 141 deletions.
7 changes: 7 additions & 0 deletions .changes/incorrect-label-linux-command.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"tauri": "patch:bug"
"tauri-runtime": "minor:bug"
"tauri-runtime-wry": "minor:bug"
---

On Linux, fix commands, that use `Webview` or `WebviewWindow` as an argument, receiving an incorrect webview when using multi webviews.
7 changes: 7 additions & 0 deletions .changes/incorrect-label-linux-event.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"tauri": "minor:bug"
"tauri-runtime": "minor:bug"
"tauri-runtime-wry": "minor:bug"
---

On Linux, fix events only emitted to first webview only when using multi webviews.
7 changes: 7 additions & 0 deletions .changes/incorrect-label-linux-protocol.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"tauri": "minor:bug"
"tauri-runtime": "minor:bug"
"tauri-runtime-wry": "minor:bug"
---

On Linux, fix custom protocols receiving an incorrect webview label when using multi webviews
126 changes: 107 additions & 19 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions crates/tauri-runtime-wry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
wry = { version = "0.44.0", default-features = false, features = [
wry = { version = "0.46", default-features = false, features = [
"drag-drop",
"protocol",
"os-webview",
Expand Down Expand Up @@ -45,8 +45,10 @@ gtk = { version = "0.18", features = ["v3_24"] }
webkit2gtk = { version = "=2.0", features = ["v2_40"] }
percent-encoding = "2.1"

[target.'cfg(target_os = "macos")'.dependencies]
[target.'cfg(target_vendor = "apple")'.dependencies]
objc2 = "0.5.2"

[target.'cfg(target_os = "macos")'.dependencies]
objc2-foundation = { version = "0.2.2", features = [] }
objc2-app-kit = { version = "0.2.2", features = [
"block2",
Expand Down
Loading

0 comments on commit 2d087ee

Please sign in to comment.