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

chore: bump winit to 0.29.2 #1637

Merged
merged 1 commit into from
Oct 21, 2023
Merged

chore: bump winit to 0.29.2 #1637

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
2 changes: 2 additions & 0 deletions glutin-winit/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Unreleased

- **Breaking:** Update _winit_ to `0.29.2`. See [winit's CHANGELOG](https://github.com/rust-windowing/winit/releases/tag/v0.29.2) for more info.

# Version 0.4.1-beta

- **Breaking:** Update _winit_ to `0.29.1-beta`. See [winit's CHANGELOG](https://github.com/rust-windowing/winit/releases/tag/v0.29.1-beta) for more info.
Expand Down
5 changes: 3 additions & 2 deletions glutin-winit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ x11 = ["glutin/x11", "winit/x11"]
wayland = ["glutin/wayland", "winit/wayland"]

[dependencies]
winit = { version = "0.29.1-beta", default-features = false }
glutin = { version = "0.30.1", path = "../glutin", default-features = false }
glutin = { version = "0.30.10", path = "../glutin", default-features = false }
raw-window-handle = "0.5"
winit = { version = "0.29.2", default-features = false, features = ["rwh_05"] }

[build-dependencies]
cfg_aliases = "0.1.1"
4 changes: 2 additions & 2 deletions glutin-winit/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ use glutin::platform::x11::X11GlConfigExt;
use glutin::prelude::*;

#[cfg(wgl_backend)]
use winit::window::raw_window_handle::HasRawWindowHandle;
use raw_window_handle::HasRawWindowHandle;

use raw_window_handle::{HasRawDisplayHandle, RawWindowHandle};
use winit::error::OsError;
use winit::event_loop::EventLoopWindowTarget;
use winit::window::raw_window_handle::{HasRawDisplayHandle, RawWindowHandle};
use winit::window::{Window, WindowBuilder};

#[cfg(glx_backend)]
Expand Down
2 changes: 1 addition & 1 deletion glutin-winit/src/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use glutin::surface::{
GlSurface, ResizeableSurface, Surface, SurfaceAttributes, SurfaceAttributesBuilder,
SurfaceTypeTrait, WindowSurface,
};
use winit::window::raw_window_handle::HasRawWindowHandle;
use raw_window_handle::HasRawWindowHandle;
use winit::window::Window;

/// [`Window`] extensions for working with [`glutin`] surfaces.
Expand Down
5 changes: 3 additions & 2 deletions glutin_examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ wayland = ["glutin-winit/wayland", "winit/wayland-dlopen", "winit/wayland-csd-ad

[dependencies]
glutin = { path = "../glutin", default-features = false }
winit = { version = "0.29.1-beta", default-features = false }
glutin-winit = { path = "../glutin-winit", default-features = false }
png = { version = "0.17.6", optional = true }
raw-window-handle = "0.5"
winit = { version = "0.29.2", default-features = false, features = ["rwh_05"] }

[target.'cfg(target_os = "android")'.dependencies]
winit = { version = "0.29.1-beta", default-features = false, features = ["android-native-activity"] }
winit = { version = "0.29.2", default-features = false, features = ["android-native-activity", "rwh_05"] }

[build-dependencies]
gl_generator = "0.14"
Expand Down
9 changes: 3 additions & 6 deletions glutin_examples/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use std::ffi::{CStr, CString};
use std::num::NonZeroU32;
use std::ops::Deref;

use raw_window_handle::HasRawWindowHandle;
use winit::event::{Event, WindowEvent};
use winit::window::raw_window_handle::HasRawWindowHandle;
use winit::window::WindowBuilder;

use glutin::config::ConfigTemplateBuilder;
Expand Down Expand Up @@ -100,8 +100,7 @@ pub fn main(event_loop: winit::event_loop::EventLoop<()>) -> Result<(), Box<dyn

let mut state = None;
let mut renderer = None;
event_loop.run(move |event, window_target, control_flow| {
control_flow.set_wait();
event_loop.run(move |event, window_target| {
match event {
Event::Resumed => {
#[cfg(android_platform)]
Expand Down Expand Up @@ -166,9 +165,7 @@ pub fn main(event_loop: winit::event_loop::EventLoop<()>) -> Result<(), Box<dyn
}
}
},
WindowEvent::CloseRequested => {
control_flow.set_exit();
},
WindowEvent::CloseRequested => window_target.exit(),
_ => (),
},
Event::AboutToWait => {
Expand Down
Loading