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

Update winit to latest commit used by upstream iced #70

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Update winit to latest commit used by upstream iced #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

Many thanks to...
- @jackpot51
- @wash2

## [0.10.0] - 2023-07-28
Expand Down
2 changes: 1 addition & 1 deletion winit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ raw-window-handle = "0.5"

[dependencies.winit]
git = "https://github.com/pop-os/winit.git"
branch = "iced"
branch = "master"

[dependencies.iced_runtime]
version = "0.1"
Expand Down
6 changes: 4 additions & 2 deletions winit/src/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ impl Window {
{
// `with_name` is available on both `WindowBuilderExtWayland` and `WindowBuilderExtX11` and they do
// exactly the same thing. We arbitrarily choose `WindowBuilderExtWayland` here.
use ::winit::platform::unix::WindowBuilderExtUnix;
use ::winit::platform::wayland::WindowBuilderExtWayland;

if let Some(id) = _id {
window_builder = window_builder.with_name(id.clone(), id);
Expand Down Expand Up @@ -202,7 +202,9 @@ impl Window {

#[cfg(target_os = "linux")]
{
use winit::platform::unix::WindowBuilderExtUnix;
// `with_name` is available on both `WindowBuilderExtWayland` and `WindowBuilderExtX11` and they do
// exactly the same thing. We arbitrarily choose `WindowBuilderExtWayland` here.
use winit::platform::wayland::WindowBuilderExtWayland;

window_builder = window_builder.with_name(
&self.platform_specific.application_id,
Expand Down
Loading