Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: imgui-rs/imgui-rs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: runplat/imgui-rs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 70 files changed
  • 1 contributor

Commits on Apr 26, 2024

  1. maint: change dep paths

    juliusl committed Apr 26, 2024
    Copy the full SHA
    ec579eb View commit details
  2. maint: reversion to 0.12.0

    juliusl committed Apr 26, 2024
    Copy the full SHA
    f1eb59a View commit details

Commits on Apr 27, 2024

  1. Copy the full SHA
    7e8063f View commit details
Showing with 28 additions and 27 deletions.
  1. +1 −4 Cargo.toml
  2. +2 −2 imgui-examples/Cargo.toml
  3. +6 −4 imgui-glium-renderer/Cargo.toml
  4. +0 −1 imgui-glium-renderer/src/lib.rs
  5. +3 −3 imgui-glow-renderer/Cargo.toml
  6. +2 −2 imgui-sdl2-support/Cargo.toml
  7. +2 −2 imgui-sys/Cargo.toml
  8. +1 −1 imgui-winit-glow-renderer-viewports/Cargo.toml
  9. +1 −0 imgui-winit-glow-renderer-viewports/src/lib.rs
  10. +2 −2 imgui-winit-support/Cargo.toml
  11. +5 −3 imgui-winit-support/src/lib.rs
  12. +3 −3 {imgui → imgui_12}/Cargo.toml
  13. 0 {imgui → imgui_12}/LICENSE-APACHE
  14. 0 {imgui → imgui_12}/LICENSE-MIT
  15. 0 {imgui → imgui_12}/README.markdown
  16. 0 {imgui → imgui_12}/src/clipboard.rs
  17. 0 {imgui → imgui_12}/src/color.rs
  18. 0 {imgui → imgui_12}/src/columns.rs
  19. 0 {imgui → imgui_12}/src/context.rs
  20. 0 {imgui → imgui_12}/src/dock_space.rs
  21. 0 {imgui → imgui_12}/src/drag_drop.rs
  22. 0 {imgui → imgui_12}/src/draw_list.rs
  23. 0 {imgui → imgui_12}/src/fonts/atlas.rs
  24. 0 {imgui → imgui_12}/src/fonts/font.rs
  25. 0 {imgui → imgui_12}/src/fonts/glyph.rs
  26. 0 {imgui → imgui_12}/src/fonts/glyph_ranges.rs
  27. 0 {imgui → imgui_12}/src/fonts/mod.rs
  28. 0 {imgui → imgui_12}/src/input/keyboard.rs
  29. 0 {imgui → imgui_12}/src/input/mod.rs
  30. 0 {imgui → imgui_12}/src/input/mouse.rs
  31. 0 {imgui → imgui_12}/src/input_widget.rs
  32. 0 {imgui → imgui_12}/src/internal.rs
  33. 0 {imgui → imgui_12}/src/io.rs
  34. 0 {imgui → imgui_12}/src/layout.rs
  35. 0 {imgui → imgui_12}/src/lib.rs
  36. 0 {imgui → imgui_12}/src/list_clipper.rs
  37. 0 {imgui → imgui_12}/src/math.rs
  38. 0 {imgui → imgui_12}/src/platform_io.rs
  39. 0 {imgui → imgui_12}/src/plothistogram.rs
  40. 0 {imgui → imgui_12}/src/plotlines.rs
  41. 0 {imgui → imgui_12}/src/popups.rs
  42. 0 {imgui → imgui_12}/src/render/draw_data.rs
  43. 0 {imgui → imgui_12}/src/render/mod.rs
  44. 0 {imgui → imgui_12}/src/render/renderer.rs
  45. 0 {imgui → imgui_12}/src/stacks.rs
  46. 0 {imgui → imgui_12}/src/string.rs
  47. 0 {imgui → imgui_12}/src/style.rs
  48. 0 {imgui → imgui_12}/src/tables.rs
  49. 0 {imgui → imgui_12}/src/test.rs
  50. 0 {imgui → imgui_12}/src/text_filter.rs
  51. 0 {imgui → imgui_12}/src/tokens.rs
  52. 0 {imgui → imgui_12}/src/utils.rs
  53. 0 {imgui → imgui_12}/src/widget/color_editors.rs
  54. 0 {imgui → imgui_12}/src/widget/combo_box.rs
  55. 0 {imgui → imgui_12}/src/widget/drag.rs
  56. 0 {imgui → imgui_12}/src/widget/image.rs
  57. 0 {imgui → imgui_12}/src/widget/list_box.rs
  58. 0 {imgui → imgui_12}/src/widget/menu.rs
  59. 0 {imgui → imgui_12}/src/widget/misc.rs
  60. 0 {imgui → imgui_12}/src/widget/mod.rs
  61. 0 {imgui → imgui_12}/src/widget/progress_bar.rs
  62. 0 {imgui → imgui_12}/src/widget/selectable.rs
  63. 0 {imgui → imgui_12}/src/widget/slider.rs
  64. 0 {imgui → imgui_12}/src/widget/tab.rs
  65. 0 {imgui → imgui_12}/src/widget/text.rs
  66. 0 {imgui → imgui_12}/src/widget/tree.rs
  67. 0 {imgui → imgui_12}/src/window/child_window.rs
  68. 0 {imgui → imgui_12}/src/window/content_region.rs
  69. 0 {imgui → imgui_12}/src/window/mod.rs
  70. 0 {imgui → imgui_12}/src/window/scroll.rs
5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
members = [
"imgui",
"imgui_12",
"imgui-sys",
"imgui-glium-renderer",
"imgui-glow-renderer",
@@ -13,6 +13,3 @@ members = [

package.rust-version = "1.70"
resolver = "2"

[patch.crates-io]
glium = { git="https://github.com/glium/glium" }
4 changes: 2 additions & 2 deletions imgui-examples/Cargo.toml
Original file line number Diff line number Diff line change
@@ -10,9 +10,9 @@ publish = false

[dev-dependencies]
copypasta = "0.8"
glium = { version = "0.33.0", default-features = true }
glium = { version = "0.34.0", default-features = true }
image = "0.23"
imgui = { path = "../imgui", features = ["tables-api"] }
imgui = { package ="imgui_12", path = "../imgui_12", features = ["tables-api"] }
imgui-glium-renderer = { path = "../imgui-glium-renderer" }
imgui-winit-support = { path = "../imgui-winit-support" }

10 changes: 6 additions & 4 deletions imgui-glium-renderer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -10,12 +10,14 @@ license = "MIT OR Apache-2.0"
categories = ["gui", "rendering"]

[dependencies]
glium = { version = "0.33.0", default-features = false }
imgui = { version = "0.11.0", path = "../imgui" }
glium = { version = "0.34.0", default-features = false }
imgui = { package = "imgui_12", version = "0.12.0", path = "../imgui_12" }

[dev-dependencies]
glium = { version = "0.33.0", default-features = false, features = ["glutin_backend"] }
imgui-winit-support = {path = "../imgui-winit-support"}
glium = { version = "0.34.0", default-features = false, features = [
"glutin_backend",
] }
imgui-winit-support = { path = "../imgui-winit-support" }
glutin = "0.31.1"
glutin-winit = "0.4.2"
winit = { version = "0.29.3", features = ["rwh_05"] }
1 change: 0 additions & 1 deletion imgui-glium-renderer/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
pub extern crate glium;
pub extern crate imgui;

use glium::backend::{Context, Facade};
use glium::index::{self, PrimitiveType};
6 changes: 3 additions & 3 deletions imgui-glow-renderer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -9,14 +9,14 @@ license = "MIT OR Apache-2.0"
categories = ["gui", "rendering"]

[dependencies]
imgui = { version = "0.11.0", path = "../imgui" }
glow = "0.12.0"
imgui = { package = "imgui_12", version = "0.12.0", path = "../imgui_12" }
glow = "0.13.1"
memoffset = "0.9"

[dev-dependencies]
glutin = "0.31.1"
glutin-winit = "0.4.2"
imgui-winit-support = { version = "0.11.0", path = "../imgui-winit-support" }
imgui-winit-support = { version = "0.12.0", path = "../imgui-winit-support" }
image = "0.23"
raw-window-handle = "0.5.0"
winit = { version = "0.29.3", features = ["rwh_05"] }
4 changes: 2 additions & 2 deletions imgui-sdl2-support/Cargo.toml
Original file line number Diff line number Diff line change
@@ -11,10 +11,10 @@ license = "MIT OR Apache-2.0"
categories = ["gui"]

[dependencies]
imgui = { version = "0.11.0", path = "../imgui" }
imgui_12 = { version = "0.12.0", path = "../imgui_12" }
sdl2 = "0.34.5"

[dev-dependencies]
glow = "0.12.0"
glow = "0.13.1"
imgui-glow-renderer = { version = "0.11.0", path = "../imgui-glow-renderer" }
sdl2 = { version = "0.34.5", features = ["bundled", "static-link"] }
4 changes: 2 additions & 2 deletions imgui-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "imgui-sys"
version = "0.11.0"
version = "0.12.0"
edition = "2021"
description = "Raw FFI bindings to dear imgui"
homepage = "https://github.com/imgui-rs/imgui-rs"
@@ -9,7 +9,7 @@ documentation = "https://docs.rs/imgui-sys"
license = "MIT OR Apache-2.0"
categories = ["gui", "external-ffi-bindings"]
build = "build.rs"
links = "imgui"
links = "imgui_12"

# exclude json, lua, and the imgui subdirs (imgui/examples, imgui/docs, etc)
# ..but we need imgui/misc/freetype/ for the freetype feature
2 changes: 1 addition & 1 deletion imgui-winit-glow-renderer-viewports/Cargo.toml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
imgui = { version = "0.11.0", path="../imgui", features=["docking"] }
imgui = { package = "imgui_12", version = "0.12.0", path="../imgui_12", features=["docking"] }

glow = "0.12.0"
glutin = "0.31.1"
1 change: 1 addition & 0 deletions imgui-winit-glow-renderer-viewports/src/lib.rs
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@ use glutin::{
prelude::GlDisplay,
surface::{GlSurface, Surface, SurfaceAttributesBuilder, WindowSurface},
};

use glutin_winit::DisplayBuilder;
use imgui::{BackendFlags, ConfigFlags, Id, Io, Key, MouseButton, ViewportFlags};
use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
4 changes: 2 additions & 2 deletions imgui-winit-support/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "imgui-winit-support"
version = "0.11.0"
version = "0.12.0"
edition = "2021"
description = "winit support code for the imgui crate"
homepage = "https://github.com/imgui-rs/imgui-rs"
@@ -10,5 +10,5 @@ license = "MIT OR Apache-2.0"
categories = ["gui"]

[dependencies]
imgui = { version = "0.11.0", path = "../imgui" }
imgui_12 = { version = "0.12.0", path = "../imgui_12" }
winit = { version = "0.29.3", default-features = false }
8 changes: 5 additions & 3 deletions imgui-winit-support/src/lib.rs
Original file line number Diff line number Diff line change
@@ -73,7 +73,11 @@
//! }).expect("EventLoop error");
//! ```
use imgui::{self, BackendFlags, ConfigFlags, Context, Io, Key, Ui};
mod imgui {
pub use imgui_12::*;
}

use imgui::{BackendFlags, ConfigFlags, Context, Io, Key, Ui};
use std::cmp::Ordering;

// Re-export winit to make it easier for users to use the correct version.
@@ -483,8 +487,6 @@ impl WinitPlatform {
// https://github.com/ocornut/imgui/issues/5047
handle_key_modifier(io, &key, pressed);

println!("KEY EVENT: {event:?}");

// Add main key event
if let Some(key) = to_imgui_key(key, event.location) {
io.add_key_event(key, pressed);
6 changes: 3 additions & 3 deletions imgui/Cargo.toml → imgui_12/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "imgui"
version = "0.11.0"
name = "imgui_12"
version = "0.12.0"
edition = "2021"
description = "High-level Rust bindings to dear imgui"
homepage = "https://github.com/imgui-rs/imgui-rs"
@@ -17,7 +17,7 @@ features = ["freetype", "docking", "tables-api"]

[dependencies]
bitflags = "1"
imgui-sys = { version = "0.11.0", path = "../imgui-sys" }
imgui-sys = { version = "0.12.0", path = "../imgui-sys" } # { version = "0.11.0", path = "../imgui-sys" }
mint = "0.5.6"
parking_lot = "0.12"
cfg-if = "1"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.