From 5bf3eff812aefd23cbc3c1b79a550270a56ed232 Mon Sep 17 00:00:00 2001 From: Malik Olivier Boussejra Date: Mon, 30 Apr 2018 12:11:30 +0900 Subject: [PATCH] [cimgui 1.53.1] Obsolete ImGuiCol::ComboBg --- CHANGELOG.markdown | 1 + imgui-sys/src/lib.rs | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown index 0b6c71734..edf0e4a7a 100644 --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -22,6 +22,7 @@ - Remove `ImGuiWindowFlags::ShowBorders` window flag. Borders are now fully set up in the ImGuiStyle structure. - Obsolete `Window::show_borders`. Use `StyleVar` instead. + - Obsolete `ImGuiCol::ComboBg`. Use `PopupBg` instead. - Style: Add `PopupRounding`, `FrameBorderSize`, `WindowBorderSize`, `PopupBorderSize`. diff --git a/imgui-sys/src/lib.rs b/imgui-sys/src/lib.rs index b762fc897..6ddbe7a41 100644 --- a/imgui-sys/src/lib.rs +++ b/imgui-sys/src/lib.rs @@ -59,7 +59,6 @@ pub enum ImGuiCol { ScrollbarGrab, ScrollbarGrabHovered, ScrollbarGrabActive, - ComboBg, CheckMark, SliderGrab, SliderGrabActive, @@ -86,6 +85,9 @@ pub enum ImGuiCol { ModalWindowDarkening, } impl ImGuiCol { + #[deprecated(since = "0.0.19", note = "ComboBg has been merged with PopupBg. Please use PopupBg instead")] + pub const ComboBg: ImGuiCol = ImGuiCol::PopupBg; + pub fn values() -> &'static [ImGuiCol] { use ImGuiCol::*; static values: &'static [ImGuiCol] = &[ @@ -107,7 +109,6 @@ impl ImGuiCol { ScrollbarGrab, ScrollbarGrabHovered, ScrollbarGrabActive, - ComboBg, CheckMark, SliderGrab, SliderGrabActive, @@ -136,7 +137,7 @@ impl ImGuiCol { values } } -pub const ImGuiCol_COUNT: usize = 43; +pub const ImGuiCol_COUNT: usize = 42; /// A variable identifier for styling #[repr(C)]