elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-26 12:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #774 from Rob2309/dependency-fixes

Browse Source 
Finally fixed dependency hell
This commit is contained in:
dbr/Ben 2024-05-05 11:00:01 +09:30 committed by GitHub
commit 1ff16791f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -13,6 +13,3 @@ members = [
package.rust-version = "1.70" package.rust-version = "1.70"
resolver = "2" resolver = "2"
[patch.crates-io]
glium = { git="https://github.com/glium/glium" }

2
imgui-examples/Cargo.toml
View File

@ -10,7 +10,7 @@ publish = false
[dev-dependencies] [dev-dependencies]
copypasta = "0.8" copypasta = "0.8"
glium = { version = "0.33.0", default-features = true } glium = { version = "0.34.0", default-features = true }
image = "0.23" image = "0.23"
imgui = { path = "../imgui", features = ["tables-api"] } imgui = { path = "../imgui", features = ["tables-api"] }
imgui-glium-renderer = { path = "../imgui-glium-renderer" } imgui-glium-renderer = { path = "../imgui-glium-renderer" }

4
imgui-glium-renderer/Cargo.toml
View File

@ -10,11 +10,11 @@ license = "MIT OR Apache-2.0"
categories = ["gui", "rendering"] categories = ["gui", "rendering"]
[dependencies] [dependencies]
glium = { version = "0.33.0", default-features = false } glium = { version = "0.34.0", default-features = false }
imgui = { version = "0.11.0", path = "../imgui" } imgui = { version = "0.11.0", path = "../imgui" }
[dev-dependencies] [dev-dependencies]
glium = { version = "0.33.0", default-features = false, features = ["glutin_backend"] } glium = { version = "0.34.0", default-features = false, features = ["glutin_backend"] }
imgui-winit-support = {path = "../imgui-winit-support"} imgui-winit-support = {path = "../imgui-winit-support"}
glutin = "0.31.1" glutin = "0.31.1"
glutin-winit = "0.4.2" glutin-winit = "0.4.2"

2
imgui-glow-renderer/Cargo.toml
View File

@ -10,7 +10,7 @@ categories = ["gui", "rendering"]
[dependencies] [dependencies]
imgui = { version = "0.11.0", path = "../imgui" } imgui = { version = "0.11.0", path = "../imgui" }
glow = "0.12.0" glow = "0.13.1"
memoffset = "0.9" memoffset = "0.9"
[dev-dependencies] [dev-dependencies]

2
imgui-sdl2-support/Cargo.toml
View File

@ -15,6 +15,6 @@ imgui = { version = "0.11.0", path = "../imgui" }
sdl2 = "0.34.5" sdl2 = "0.34.5"
[dev-dependencies] [dev-dependencies]
glow = "0.12.0" glow = "0.13.1"
imgui-glow-renderer = { version = "0.11.0", path = "../imgui-glow-renderer" } imgui-glow-renderer = { version = "0.11.0", path = "../imgui-glow-renderer" }
sdl2 = { version = "0.34.5", features = ["bundled", "static-link"] } sdl2 = { version = "0.34.5", features = ["bundled", "static-link"] }

2
imgui-winit-glow-renderer-viewports/Cargo.toml
View File

@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
[dependencies] [dependencies]
imgui = { version = "0.11.0", path="../imgui", features=["docking"] } imgui = { version = "0.11.0", path="../imgui", features=["docking"] }
glow = "0.12.0" glow = "0.13.1"
glutin = "0.31.1" glutin = "0.31.1"
glutin-winit = "0.4.2" glutin-winit = "0.4.2"
raw-window-handle = "0.5.0" raw-window-handle = "0.5.0"

2
imgui-winit-support/src/lib.rs
View File

@ -483,8 +483,6 @@ impl WinitPlatform {
// https://github.com/ocornut/imgui/issues/5047 // https://github.com/ocornut/imgui/issues/5047
handle_key_modifier(io, &key, pressed); handle_key_modifier(io, &key, pressed);
println!("KEY EVENT: {event:?}");
// Add main key event // Add main key event
if let Some(key) = to_imgui_key(key, event.location) { if let Some(key) = to_imgui_key(key, event.location) {
io.add_key_event(key, pressed); io.add_key_event(key, pressed);