diff --git a/Cargo.toml b/Cargo.toml index f0438d14a..261c8408f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = [ - "imgui", + "imgui_12", "imgui-sys", "imgui-glium-renderer", "imgui-glow-renderer", diff --git a/imgui-examples/Cargo.toml b/imgui-examples/Cargo.toml index 6accc2e73..2a22fb3f1 100644 --- a/imgui-examples/Cargo.toml +++ b/imgui-examples/Cargo.toml @@ -12,7 +12,7 @@ publish = false copypasta = "0.8" 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" } diff --git a/imgui-glium-renderer/Cargo.toml b/imgui-glium-renderer/Cargo.toml index b80134e5d..2181f098b 100644 --- a/imgui-glium-renderer/Cargo.toml +++ b/imgui-glium-renderer/Cargo.toml @@ -11,11 +11,13 @@ categories = ["gui", "rendering"] [dependencies] glium = { version = "0.34.0", default-features = false } -imgui = { version = "0.12.0", path = "../imgui" } +imgui = { package = "imgui_12", version = "0.12.0", path = "../imgui_12" } [dev-dependencies] -glium = { version = "0.34.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"] } diff --git a/imgui-glium-renderer/src/lib.rs b/imgui-glium-renderer/src/lib.rs index 82ea24cf6..47225a681 100644 --- a/imgui-glium-renderer/src/lib.rs +++ b/imgui-glium-renderer/src/lib.rs @@ -1,5 +1,4 @@ pub extern crate glium; -pub extern crate imgui; use glium::backend::{Context, Facade}; use glium::index::{self, PrimitiveType}; diff --git a/imgui-glow-renderer/Cargo.toml b/imgui-glow-renderer/Cargo.toml index 776439bc5..2bd5383d2 100644 --- a/imgui-glow-renderer/Cargo.toml +++ b/imgui-glow-renderer/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" categories = ["gui", "rendering"] [dependencies] -imgui = { version = "0.12.0", path = "../imgui" } +imgui = { package = "imgui_12", version = "0.12.0", path = "../imgui_12" } glow = "0.13.1" memoffset = "0.9" diff --git a/imgui-sdl2-support/Cargo.toml b/imgui-sdl2-support/Cargo.toml index e433fe39c..b5b1dfe99 100644 --- a/imgui-sdl2-support/Cargo.toml +++ b/imgui-sdl2-support/Cargo.toml @@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0" categories = ["gui"] [dependencies] -imgui = { version = "0.12.0", path = "../imgui" } +imgui_12 = { version = "0.12.0", path = "../imgui_12" } sdl2 = "0.34.5" [dev-dependencies] diff --git a/imgui-sys/Cargo.toml b/imgui-sys/Cargo.toml index ace456924..bfbf032b8 100644 --- a/imgui-sys/Cargo.toml +++ b/imgui-sys/Cargo.toml @@ -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 diff --git a/imgui-winit-glow-renderer-viewports/Cargo.toml b/imgui-winit-glow-renderer-viewports/Cargo.toml index e57197ecc..0901793a8 100644 --- a/imgui-winit-glow-renderer-viewports/Cargo.toml +++ b/imgui-winit-glow-renderer-viewports/Cargo.toml @@ -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.12.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" diff --git a/imgui-winit-glow-renderer-viewports/src/lib.rs b/imgui-winit-glow-renderer-viewports/src/lib.rs index 22b2c5b81..fdce4b2e7 100644 --- a/imgui-winit-glow-renderer-viewports/src/lib.rs +++ b/imgui-winit-glow-renderer-viewports/src/lib.rs @@ -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}; diff --git a/imgui-winit-support/Cargo.toml b/imgui-winit-support/Cargo.toml index 59ee88cfa..d38cc0a79 100644 --- a/imgui-winit-support/Cargo.toml +++ b/imgui-winit-support/Cargo.toml @@ -10,5 +10,5 @@ license = "MIT OR Apache-2.0" categories = ["gui"] [dependencies] -imgui = { version = "0.12.0", path = "../imgui" } +imgui_12 = { version = "0.12.0", path = "../imgui_12" } winit = { version = "0.29.3", default-features = false } diff --git a/imgui-winit-support/src/lib.rs b/imgui-winit-support/src/lib.rs index ddc1c8e69..7055ef239 100644 --- a/imgui-winit-support/src/lib.rs +++ b/imgui-winit-support/src/lib.rs @@ -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. diff --git a/imgui/Cargo.toml b/imgui_12/Cargo.toml similarity index 98% rename from imgui/Cargo.toml rename to imgui_12/Cargo.toml index 16914b00f..c006bcf39 100644 --- a/imgui/Cargo.toml +++ b/imgui_12/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "imgui" +name = "imgui_12" version = "0.12.0" edition = "2021" description = "High-level Rust bindings to dear imgui" diff --git a/imgui/LICENSE-APACHE b/imgui_12/LICENSE-APACHE similarity index 100% rename from imgui/LICENSE-APACHE rename to imgui_12/LICENSE-APACHE diff --git a/imgui/LICENSE-MIT b/imgui_12/LICENSE-MIT similarity index 100% rename from imgui/LICENSE-MIT rename to imgui_12/LICENSE-MIT diff --git a/imgui/README.markdown b/imgui_12/README.markdown similarity index 100% rename from imgui/README.markdown rename to imgui_12/README.markdown diff --git a/imgui/src/clipboard.rs b/imgui_12/src/clipboard.rs similarity index 100% rename from imgui/src/clipboard.rs rename to imgui_12/src/clipboard.rs diff --git a/imgui/src/color.rs b/imgui_12/src/color.rs similarity index 100% rename from imgui/src/color.rs rename to imgui_12/src/color.rs diff --git a/imgui/src/columns.rs b/imgui_12/src/columns.rs similarity index 100% rename from imgui/src/columns.rs rename to imgui_12/src/columns.rs diff --git a/imgui/src/context.rs b/imgui_12/src/context.rs similarity index 100% rename from imgui/src/context.rs rename to imgui_12/src/context.rs diff --git a/imgui/src/dock_space.rs b/imgui_12/src/dock_space.rs similarity index 100% rename from imgui/src/dock_space.rs rename to imgui_12/src/dock_space.rs diff --git a/imgui/src/drag_drop.rs b/imgui_12/src/drag_drop.rs similarity index 100% rename from imgui/src/drag_drop.rs rename to imgui_12/src/drag_drop.rs diff --git a/imgui/src/draw_list.rs b/imgui_12/src/draw_list.rs similarity index 100% rename from imgui/src/draw_list.rs rename to imgui_12/src/draw_list.rs diff --git a/imgui/src/fonts/atlas.rs b/imgui_12/src/fonts/atlas.rs similarity index 100% rename from imgui/src/fonts/atlas.rs rename to imgui_12/src/fonts/atlas.rs diff --git a/imgui/src/fonts/font.rs b/imgui_12/src/fonts/font.rs similarity index 100% rename from imgui/src/fonts/font.rs rename to imgui_12/src/fonts/font.rs diff --git a/imgui/src/fonts/glyph.rs b/imgui_12/src/fonts/glyph.rs similarity index 100% rename from imgui/src/fonts/glyph.rs rename to imgui_12/src/fonts/glyph.rs diff --git a/imgui/src/fonts/glyph_ranges.rs b/imgui_12/src/fonts/glyph_ranges.rs similarity index 100% rename from imgui/src/fonts/glyph_ranges.rs rename to imgui_12/src/fonts/glyph_ranges.rs diff --git a/imgui/src/fonts/mod.rs b/imgui_12/src/fonts/mod.rs similarity index 100% rename from imgui/src/fonts/mod.rs rename to imgui_12/src/fonts/mod.rs diff --git a/imgui/src/input/keyboard.rs b/imgui_12/src/input/keyboard.rs similarity index 100% rename from imgui/src/input/keyboard.rs rename to imgui_12/src/input/keyboard.rs diff --git a/imgui/src/input/mod.rs b/imgui_12/src/input/mod.rs similarity index 100% rename from imgui/src/input/mod.rs rename to imgui_12/src/input/mod.rs diff --git a/imgui/src/input/mouse.rs b/imgui_12/src/input/mouse.rs similarity index 100% rename from imgui/src/input/mouse.rs rename to imgui_12/src/input/mouse.rs diff --git a/imgui/src/input_widget.rs b/imgui_12/src/input_widget.rs similarity index 100% rename from imgui/src/input_widget.rs rename to imgui_12/src/input_widget.rs diff --git a/imgui/src/internal.rs b/imgui_12/src/internal.rs similarity index 100% rename from imgui/src/internal.rs rename to imgui_12/src/internal.rs diff --git a/imgui/src/io.rs b/imgui_12/src/io.rs similarity index 100% rename from imgui/src/io.rs rename to imgui_12/src/io.rs diff --git a/imgui/src/layout.rs b/imgui_12/src/layout.rs similarity index 100% rename from imgui/src/layout.rs rename to imgui_12/src/layout.rs diff --git a/imgui/src/lib.rs b/imgui_12/src/lib.rs similarity index 100% rename from imgui/src/lib.rs rename to imgui_12/src/lib.rs diff --git a/imgui/src/list_clipper.rs b/imgui_12/src/list_clipper.rs similarity index 100% rename from imgui/src/list_clipper.rs rename to imgui_12/src/list_clipper.rs diff --git a/imgui/src/math.rs b/imgui_12/src/math.rs similarity index 100% rename from imgui/src/math.rs rename to imgui_12/src/math.rs diff --git a/imgui/src/platform_io.rs b/imgui_12/src/platform_io.rs similarity index 100% rename from imgui/src/platform_io.rs rename to imgui_12/src/platform_io.rs diff --git a/imgui/src/plothistogram.rs b/imgui_12/src/plothistogram.rs similarity index 100% rename from imgui/src/plothistogram.rs rename to imgui_12/src/plothistogram.rs diff --git a/imgui/src/plotlines.rs b/imgui_12/src/plotlines.rs similarity index 100% rename from imgui/src/plotlines.rs rename to imgui_12/src/plotlines.rs diff --git a/imgui/src/popups.rs b/imgui_12/src/popups.rs similarity index 100% rename from imgui/src/popups.rs rename to imgui_12/src/popups.rs diff --git a/imgui/src/render/draw_data.rs b/imgui_12/src/render/draw_data.rs similarity index 100% rename from imgui/src/render/draw_data.rs rename to imgui_12/src/render/draw_data.rs diff --git a/imgui/src/render/mod.rs b/imgui_12/src/render/mod.rs similarity index 100% rename from imgui/src/render/mod.rs rename to imgui_12/src/render/mod.rs diff --git a/imgui/src/render/renderer.rs b/imgui_12/src/render/renderer.rs similarity index 100% rename from imgui/src/render/renderer.rs rename to imgui_12/src/render/renderer.rs diff --git a/imgui/src/stacks.rs b/imgui_12/src/stacks.rs similarity index 100% rename from imgui/src/stacks.rs rename to imgui_12/src/stacks.rs diff --git a/imgui/src/string.rs b/imgui_12/src/string.rs similarity index 100% rename from imgui/src/string.rs rename to imgui_12/src/string.rs diff --git a/imgui/src/style.rs b/imgui_12/src/style.rs similarity index 100% rename from imgui/src/style.rs rename to imgui_12/src/style.rs diff --git a/imgui/src/tables.rs b/imgui_12/src/tables.rs similarity index 100% rename from imgui/src/tables.rs rename to imgui_12/src/tables.rs diff --git a/imgui/src/test.rs b/imgui_12/src/test.rs similarity index 100% rename from imgui/src/test.rs rename to imgui_12/src/test.rs diff --git a/imgui/src/text_filter.rs b/imgui_12/src/text_filter.rs similarity index 100% rename from imgui/src/text_filter.rs rename to imgui_12/src/text_filter.rs diff --git a/imgui/src/tokens.rs b/imgui_12/src/tokens.rs similarity index 100% rename from imgui/src/tokens.rs rename to imgui_12/src/tokens.rs diff --git a/imgui/src/utils.rs b/imgui_12/src/utils.rs similarity index 100% rename from imgui/src/utils.rs rename to imgui_12/src/utils.rs diff --git a/imgui/src/widget/color_editors.rs b/imgui_12/src/widget/color_editors.rs similarity index 100% rename from imgui/src/widget/color_editors.rs rename to imgui_12/src/widget/color_editors.rs diff --git a/imgui/src/widget/combo_box.rs b/imgui_12/src/widget/combo_box.rs similarity index 100% rename from imgui/src/widget/combo_box.rs rename to imgui_12/src/widget/combo_box.rs diff --git a/imgui/src/widget/drag.rs b/imgui_12/src/widget/drag.rs similarity index 100% rename from imgui/src/widget/drag.rs rename to imgui_12/src/widget/drag.rs diff --git a/imgui/src/widget/image.rs b/imgui_12/src/widget/image.rs similarity index 100% rename from imgui/src/widget/image.rs rename to imgui_12/src/widget/image.rs diff --git a/imgui/src/widget/list_box.rs b/imgui_12/src/widget/list_box.rs similarity index 100% rename from imgui/src/widget/list_box.rs rename to imgui_12/src/widget/list_box.rs diff --git a/imgui/src/widget/menu.rs b/imgui_12/src/widget/menu.rs similarity index 100% rename from imgui/src/widget/menu.rs rename to imgui_12/src/widget/menu.rs diff --git a/imgui/src/widget/misc.rs b/imgui_12/src/widget/misc.rs similarity index 100% rename from imgui/src/widget/misc.rs rename to imgui_12/src/widget/misc.rs diff --git a/imgui/src/widget/mod.rs b/imgui_12/src/widget/mod.rs similarity index 100% rename from imgui/src/widget/mod.rs rename to imgui_12/src/widget/mod.rs diff --git a/imgui/src/widget/progress_bar.rs b/imgui_12/src/widget/progress_bar.rs similarity index 100% rename from imgui/src/widget/progress_bar.rs rename to imgui_12/src/widget/progress_bar.rs diff --git a/imgui/src/widget/selectable.rs b/imgui_12/src/widget/selectable.rs similarity index 100% rename from imgui/src/widget/selectable.rs rename to imgui_12/src/widget/selectable.rs diff --git a/imgui/src/widget/slider.rs b/imgui_12/src/widget/slider.rs similarity index 100% rename from imgui/src/widget/slider.rs rename to imgui_12/src/widget/slider.rs diff --git a/imgui/src/widget/tab.rs b/imgui_12/src/widget/tab.rs similarity index 100% rename from imgui/src/widget/tab.rs rename to imgui_12/src/widget/tab.rs diff --git a/imgui/src/widget/text.rs b/imgui_12/src/widget/text.rs similarity index 100% rename from imgui/src/widget/text.rs rename to imgui_12/src/widget/text.rs diff --git a/imgui/src/widget/tree.rs b/imgui_12/src/widget/tree.rs similarity index 100% rename from imgui/src/widget/tree.rs rename to imgui_12/src/widget/tree.rs diff --git a/imgui/src/window/child_window.rs b/imgui_12/src/window/child_window.rs similarity index 100% rename from imgui/src/window/child_window.rs rename to imgui_12/src/window/child_window.rs diff --git a/imgui/src/window/content_region.rs b/imgui_12/src/window/content_region.rs similarity index 100% rename from imgui/src/window/content_region.rs rename to imgui_12/src/window/content_region.rs diff --git a/imgui/src/window/mod.rs b/imgui_12/src/window/mod.rs similarity index 100% rename from imgui/src/window/mod.rs rename to imgui_12/src/window/mod.rs diff --git a/imgui/src/window/scroll.rs b/imgui_12/src/window/scroll.rs similarity index 100% rename from imgui/src/window/scroll.rs rename to imgui_12/src/window/scroll.rs