Skip to content
This repository has been archived by the owner on Sep 22, 2024. It is now read-only.

Commit

Permalink
Update SCTK to 0.12
Browse files Browse the repository at this point in the history
SCTK was a bit behind on Wayland protocol version, and so this release
brings it up to date. It also cleans up 'Environment'.
  • Loading branch information
kchibisov authored Sep 30, 2020
1 parent 3d85af0 commit b9f3d33
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
- **Breaking:** On Wayland, `Theme` trait was reworked.
- On Wayland, disable maximize button for non-resizable window.
- On Wayland, added support for `set_ime_position`.
- On Wayland, fix crash on startup since GNOME 3.37.90.

# 0.22.2 (2020-05-16)

Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ features = [
]

[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd"))'.dependencies]
wayland-client = { version = "0.27", features = [ "dlopen"] , optional = true }
sctk = { package = "smithay-client-toolkit", version = "0.11", optional = true }
wayland-client = { version = "0.28", features = [ "dlopen"] , optional = true }
sctk = { package = "smithay-client-toolkit", version = "0.12", optional = true }
mio = "0.6"
mio-extras = "2.0"
x11-dl = { version = "2.18.5", optional = true }
Expand Down
6 changes: 1 addition & 5 deletions src/platform_impl/linux/wayland/event_loop/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,7 @@ impl<T: 'static> EventLoop<T> {
let display_proxy = display.attach(event_queue.token());

// Setup environment.
let env = Environment::init(&display_proxy, WinitEnv::new());

// Issue 2 sync roundtrips to initialize environment.
event_queue.sync_roundtrip(&mut (), |_, _, _| unreachable!())?;
event_queue.sync_roundtrip(&mut (), |_, _, _| unreachable!())?;
let env = Environment::new(&display_proxy, &mut event_queue, WinitEnv::new())?;

// Create event loop.
let event_loop = calloop::EventLoop::<WinitState>::new()?;
Expand Down

0 comments on commit b9f3d33

Please sign in to comment.