[cimgui 1.53.1] Obsolete ImGuiCol::ComboBg

This commit is contained in:
Malik Olivier Boussejra 2018-04-30 12:11:30 +09:00
parent 112d21133b
commit 5bf3eff812
2 changed files with 5 additions and 3 deletions

View File

@ -22,6 +22,7 @@
- Remove `ImGuiWindowFlags::ShowBorders` window flag. Borders are now fully - Remove `ImGuiWindowFlags::ShowBorders` window flag. Borders are now fully
set up in the ImGuiStyle structure. set up in the ImGuiStyle structure.
- Obsolete `Window::show_borders`. Use `StyleVar` instead. - Obsolete `Window::show_borders`. Use `StyleVar` instead.
- Obsolete `ImGuiCol::ComboBg`. Use `PopupBg` instead.
- Style: Add `PopupRounding`, `FrameBorderSize`, `WindowBorderSize`, `PopupBorderSize`. - Style: Add `PopupRounding`, `FrameBorderSize`, `WindowBorderSize`, `PopupBorderSize`.

View File

@ -59,7 +59,6 @@ pub enum ImGuiCol {
ScrollbarGrab, ScrollbarGrab,
ScrollbarGrabHovered, ScrollbarGrabHovered,
ScrollbarGrabActive, ScrollbarGrabActive,
ComboBg,
CheckMark, CheckMark,
SliderGrab, SliderGrab,
SliderGrabActive, SliderGrabActive,
@ -86,6 +85,9 @@ pub enum ImGuiCol {
ModalWindowDarkening, ModalWindowDarkening,
} }
impl ImGuiCol { 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] { pub fn values() -> &'static [ImGuiCol] {
use ImGuiCol::*; use ImGuiCol::*;
static values: &'static [ImGuiCol] = &[ static values: &'static [ImGuiCol] = &[
@ -107,7 +109,6 @@ impl ImGuiCol {
ScrollbarGrab, ScrollbarGrab,
ScrollbarGrabHovered, ScrollbarGrabHovered,
ScrollbarGrabActive, ScrollbarGrabActive,
ComboBg,
CheckMark, CheckMark,
SliderGrab, SliderGrab,
SliderGrabActive, SliderGrabActive,
@ -136,7 +137,7 @@ impl ImGuiCol {
values values
} }
} }
pub const ImGuiCol_COUNT: usize = 43; pub const ImGuiCol_COUNT: usize = 42;
/// A variable identifier for styling /// A variable identifier for styling
#[repr(C)] #[repr(C)]