Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix incorrect label passed to ipc protocol #11268

Merged
merged 13 commits into from
Oct 12, 2024
Merged

fix: fix incorrect label passed to ipc protocol #11268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d1b985b
fix: fix incorrect label passed to `ipc` protocol
amrbashir Oct 8, 2024
9bd6fe7
update lock file
amrbashir Oct 11, 2024
0906aea
Update .changes/incorrect-label-linux-command.md
amrbashir Oct 11, 2024
0f5d122
Update .changes/incorrect-label-linux-protocol.md
amrbashir Oct 11, 2024
b8ecd59
clippy
amrbashir Oct 11, 2024
8190804
Merge branch 'fix/fix-ipc-protocol-label' of https://github.com/tauri…
amrbashir Oct 11, 2024
4722b5f
Merge remote-tracking branch 'origin/dev' into fix/fix-ipc-protocol-l…
lucasfernog Oct 11, 2024
f98341e
try wry from dev
lucasfernog Oct 11, 2024
1fd0b83
fix macos build
lucasfernog Oct 11, 2024
64974ce
fix ios build
lucasfernog Oct 11, 2024
4cb9cca
update wry
lucasfernog Oct 11, 2024
eb1c4f7
Update .changes/incorrect-label-linux-command.md
amrbashir Oct 12, 2024
958dad1
wry 0.46
lucasfernog Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changes/incorrect-label-linux-command.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
Loading