From 136d4ae1a3f1cca3aa05523012663d11e946ecf1 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 2 Aug 2021 18:12:29 +0200 Subject: [PATCH] Update imgui to 0.7.0 (#1) * Update imgui to 0.7.0 * Change the submodule URL to https --- .gitmodules | 2 +- Cargo.toml | 2 +- imgui-memory-editor-sys/Cargo.toml | 2 +- src/memory_editor.rs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 20e8f42..ca87ae2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "imgui-memory-editor-sys/vendor/imgui-memory-editor"] path = imgui-memory-editor-sys/vendor/imgui-memory-editor - url = git@github.com:ocornut/imgui_club.git + url = https://github.com/ocornut/imgui_club.git diff --git a/Cargo.toml b/Cargo.toml index c5f8835..86b05c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,5 +12,5 @@ keywords = ["imgui", "memory", "editor"] categories = ["gui", "api-bindings"] [dependencies] -imgui = "0.6.1" +imgui = "0.7.0" imgui-memory-editor-sys = { path = "imgui-memory-editor-sys", version = "0.2.0" } diff --git a/imgui-memory-editor-sys/Cargo.toml b/imgui-memory-editor-sys/Cargo.toml index 19d1f0a..5de00d6 100644 --- a/imgui-memory-editor-sys/Cargo.toml +++ b/imgui-memory-editor-sys/Cargo.toml @@ -12,7 +12,7 @@ links = "imgui_memory_editor" [dependencies] cty = "0.2.1" -imgui-sys = "0.6.0" +imgui-sys = "0.7.0" [build-dependencies] cc = "1.0.66" diff --git a/src/memory_editor.rs b/src/memory_editor.rs index b28b7c9..a3db3c4 100644 --- a/src/memory_editor.rs +++ b/src/memory_editor.rs @@ -1,6 +1,6 @@ use std::ffi::c_void; -use imgui::{ImColor, ImStr, Ui}; +use imgui::{ImColor32, ImStr, Ui}; // TODO: Alias ReadHandlerTrait and writeHandlerTrait to FnMuts once trait_alias is stabilized @@ -120,7 +120,7 @@ impl<'a, T> MemoryEditor<'a, T> { } // background color of highlighted bytes. #[inline] - pub fn highlight_color(mut self, color: ImColor) -> Self { + pub fn highlight_color(mut self, color: ImColor32) -> Self { self.raw.HighlightColor = color.into(); self }