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

Add support & upgrade to winit 0.25 #485

Merged
merged 6 commits into from May 23, 2021
Merged

Add support & upgrade to winit 0.25 #485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee6b1dd
Add support & upgrade to winit 0.25
repi May 22, 2021
e964dce
Use winit 0.24 for examples due to glutin
repi May 22, 2021
4569524
Switch back to winit 0.24 as default
repi May 22, 2021
92bed93
Only use single winit version
repi May 22, 2021
d82c9a0
Make winit 0.25 default again
repi May 23, 2021
6863461
Revert "Make winit 0.25 default again"
repi May 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion imgui-winit-support/Cargo.toml
View file
Open in desktop
Expand Up @@ -16,9 +16,10 @@ winit-20 = { version = ">= 0.20, < 0.22", package = "winit", optional = true }
winit-22 = { version = "0.22", package = "winit", optional = true }
winit-23 = { version = "0.23", package = "winit", optional = true }
winit-24 = { version = "0.24", package = "winit", optional = true }
winit-25 = { version = "0.25", package = "winit", optional = true }

[features]
default = ["winit-24"]
default = ["winit-25"]

# This is phrased as a negative (unlike most features) so that it needs to be
# explicitly disabled (and `default-features = false` won't do it). To avoid
Expand Down
78 changes: 60 additions & 18 deletions imgui-winit-support/src/lib.rs
View file
Open in desktop
Expand Up @@ -79,9 +79,10 @@
//!
//! The following versions are supported, controlled by the listed feature.
//!
//! - The `winit-24` feature supports winit versions `0.24`. This is
//! - The `winit-25` feature supports winit versions `0.25`. This is
//! on by default, so to use any other version you need to disable this crates
//! default features.
//! - The `winit-24` feature uses winit versions compatible with `0.24`.
//! - The `winit-23` feature uses winit versions compatible with `0.23`.
//! - The `winit-22` feature uses winit versions compatible with `0.22`.
//! - The `winit-20` feature should support winit either `0.20` or winit `0.21`.
Expand Down Expand Up @@ -132,26 +133,38 @@
//! - Changing the default feature to the new latest `winit` version is *not* a
//! breaking change.

#[cfg(feature = "winit-25")]
use winit_25 as winit;

#[cfg(feature = "winit-24")]
use winit_24 as winit;

#[cfg(all(not(feature = "winit-24"), feature = "winit-23"))]
#[cfg(all(
not(any(feature = "winit-25", feature = "winit-24")),
feature = "winit-23"
))]
use winit_23 as winit;

#[cfg(all(
not(any(feature = "winit-24", feature = "winit-23")),
not(any(feature = "winit-25", feature = "winit-24", feature = "winit-23")),
feature = "winit-22",
))]
use winit_22 as winit;

#[cfg(all(
not(any(feature = "winit-24", feature = "winit-23", feature = "winit-22")),
not(any(
feature = "winit-25",
feature = "winit-24",
feature = "winit-23",
feature = "winit-22"
)),
feature = "winit-20",
))]
use winit_20 as winit;

#[cfg(all(
not(any(
feature = "winit-25",
feature = "winit-24",
feature = "winit-23",
feature = "winit-22",
Expand All @@ -168,6 +181,7 @@ use winit::dpi::{LogicalPosition, LogicalSize};

#[cfg(all(
not(any(
feature = "winit-25",
feature = "winit-24",
feature = "winit-23",
feature = "winit-22",
Expand All @@ -184,7 +198,8 @@ use winit::{
feature = "winit-20",
feature = "winit-22",
feature = "winit-23",
feature = "winit-24"
feature = "winit-24",
feature = "winit-25"
))]
use winit::{
error::ExternalError,
Expand All @@ -202,6 +217,7 @@ use winit::{
feature = "winit-22",
feature = "winit-23",
feature = "winit-24",
feature = "winit-25",
)))]
compile_error!("Please enable at least one version of `winit` (see documentation for details).");

Expand All @@ -213,7 +229,8 @@ fn check_multiple_winits() {
if cfg!(any(not(debug_assertions), feature = "no-warn-on-multiple")) {
return;
}
let winits_enabled = cfg!(feature = "winit-24") as usize
let winits_enabled = cfg!(feature = "winit-25") as usize
+ cfg!(feature = "winit-24") as usize
+ cfg!(feature = "winit-23") as usize
+ cfg!(feature = "winit-22") as usize
+ cfg!(feature = "winit-20") as usize
Expand Down Expand Up @@ -241,7 +258,8 @@ fn check_multiple_winits() {
(this likely indicates misconfiguration, see documentation for details)."
);
let feats = [
("winit-24", cfg!(feature = "winit-24"), " (default)"),
("winit-25", cfg!(feature = "winit-25"), " (default)"),
("winit-24", cfg!(feature = "winit-24"), ""),
("winit-23", cfg!(feature = "winit-23"), ""),
("winit-22", cfg!(feature = "winit-22"), ""),
("winit-20", cfg!(feature = "winit-20"), ""),
Expand All @@ -252,7 +270,7 @@ fn check_multiple_winits() {
let _ = writeln!(err, " `feature = {:?}` is enabled{}", name, extra);
}
}
if cfg!(feature = "winit-24") && winits_enabled == 2 {
if cfg!(feature = "winit-25") && winits_enabled == 2 {
let _ = writeln!(
err,
" Perhaps you are missing a `default-features = false`?",
Expand Down Expand Up @@ -330,6 +348,7 @@ fn to_winit_cursor(cursor: imgui::MouseCursor) -> MouseCursor {
impl CursorSettings {
#[cfg(all(
not(any(
feature = "winit-25",
feature = "winit-24",
feature = "winit-23",
feature = "winit-22",
Expand All @@ -350,7 +369,8 @@ impl CursorSettings {
feature = "winit-20",
feature = "winit-22",
feature = "winit-23",
feature = "winit-24"
feature = "winit-24",
feature = "winit-25"
))]
fn apply(&self, window: &Window) {
match self.cursor {
Expand Down Expand Up @@ -458,6 +478,7 @@ impl WinitPlatform {
/// * display size is set
#[cfg(all(
not(any(
feature = "winit-25",
feature = "winit-24",
feature = "winit-23",
feature = "winit-22",
Expand Down Expand Up @@ -485,7 +506,8 @@ impl WinitPlatform {
feature = "winit-20",
feature = "winit-22",
feature = "winit-23",
feature = "winit-24"
feature = "winit-24",
feature = "winit-25",
))]
pub fn attach_window(&mut self, io: &mut Io, window: &Window, hidpi_mode: HiDpiMode) {
let (hidpi_mode, hidpi_factor) = hidpi_mode.apply(window.scale_factor());
Expand All @@ -508,6 +530,7 @@ impl WinitPlatform {
/// your application to use the same logical coordinates as imgui-rs.
#[cfg(all(
not(any(
feature = "winit-25",
feature = "winit-24",
feature = "winit-23",
feature = "winit-22",
Expand All @@ -531,7 +554,8 @@ impl WinitPlatform {
feature = "winit-20",
feature = "winit-22",
feature = "winit-23",
feature = "winit-24"
feature = "winit-24",
feature = "winit-25"
))]
pub fn scale_size_from_winit(
&self,
Expand All @@ -551,6 +575,7 @@ impl WinitPlatform {
/// your application to use the same logical coordinates as imgui-rs.
#[cfg(all(
not(any(
feature = "winit-25",
feature = "winit-24",
feature = "winit-23",
feature = "winit-22",
Expand Down Expand Up @@ -578,7 +603,8 @@ impl WinitPlatform {
feature = "winit-20",
feature = "winit-22",
feature = "winit-23",
feature = "winit-24"
feature = "winit-24",
feature = "winit-25"
))]
pub fn scale_pos_from_winit(
&self,
Expand All @@ -598,6 +624,7 @@ impl WinitPlatform {
/// your application to use the same logical coordinates as imgui-rs.
#[cfg(all(
not(any(
feature = "winit-25",
feature = "winit-24",
feature = "winit-23",
feature = "winit-22",
Expand Down Expand Up @@ -625,7 +652,8 @@ impl WinitPlatform {
feature = "winit-20",
feature = "winit-22",
feature = "winit-23",
feature = "winit-24"
feature = "winit-24",
feature = "winit-25"
))]
pub fn scale_pos_for_winit(
&self,
Expand All @@ -648,6 +676,7 @@ impl WinitPlatform {
/// * mouse state is updated
#[cfg(all(
not(any(
feature = "winit-25",
feature = "winit-24",
feature = "winit-23",
feature = "winit-22",
Expand Down Expand Up @@ -694,7 +723,12 @@ impl WinitPlatform {
/// * keyboard state is updated
/// * mouse state is updated
#[cfg(all(
not(any(feature = "winit-24", feature = "winit-23", feature = "winit-22")),
not(any(
feature = "winit-25",
feature = "winit-24",
feature = "winit-23",
feature = "winit-22"
)),
feature = "winit-20",
))]
pub fn handle_event<T>(&mut self, io: &mut Io, window: &Window, event: &Event<T>) {
Expand Down Expand Up @@ -741,7 +775,12 @@ impl WinitPlatform {
/// * window size / dpi factor changes are applied
/// * keyboard state is updated
/// * mouse state is updated
#[cfg(any(feature = "winit-22", feature = "winit-23", feature = "winit-24"))]
#[cfg(any(
feature = "winit-22",
feature = "winit-23",
feature = "winit-24",
feature = "winit-25"
))]
pub fn handle_event<T>(&mut self, io: &mut Io, window: &Window, event: &Event<T>) {
match *event {
Event::WindowEvent {
Expand Down Expand Up @@ -778,6 +817,7 @@ impl WinitPlatform {
}
#[cfg(all(
not(any(
feature = "winit-25",
feature = "winit-24",
feature = "winit-23",
feature = "winit-22",
Expand Down Expand Up @@ -873,7 +913,7 @@ impl WinitPlatform {
}
}
#[cfg(all(
not(any(feature = "winit-23", feature = "winit-24")),
not(any(feature = "winit-23", feature = "winit-24", feature = "winit-25")),
any(feature = "winit-20", feature = "winit-22")
))]
fn handle_window_event(&mut self, io: &mut Io, window: &Window, event: &WindowEvent) {
Expand Down Expand Up @@ -978,7 +1018,7 @@ impl WinitPlatform {
}
}

#[cfg(any(feature = "winit-23", feature = "winit-24"))]
#[cfg(any(feature = "winit-23", feature = "winit-24", feature = "winit-25"))]
fn handle_window_event(&mut self, io: &mut Io, window: &Window, event: &WindowEvent) {
match *event {
WindowEvent::Resized(physical_size) => {
Expand Down Expand Up @@ -1089,6 +1129,7 @@ impl WinitPlatform {
/// * mouse cursor is repositioned (if requested by imgui-rs)
#[cfg(all(
not(any(
feature = "winit-25",
feature = "winit-24",
feature = "winit-23",
feature = "winit-22",
Expand Down Expand Up @@ -1118,7 +1159,8 @@ impl WinitPlatform {
feature = "winit-20",
feature = "winit-22",
feature = "winit-23",
feature = "winit-24"
feature = "winit-24",
feature = "winit-25"
))]
pub fn prepare_frame(&self, io: &mut Io, window: &Window) -> Result<(), ExternalError> {
self.copy_mouse_to_io(&mut io.mouse_down);
Expand Down