Skip to content

Commit

Permalink
[cimgui 1.53.1] Obsolete ImGuiCol::ComboBg
Browse files Browse the repository at this point in the history
  • Loading branch information
malikolivier committed Apr 30, 2018
1 parent 112d211 commit 5bf3eff
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.markdown
Expand Up @@ -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`.

Expand Down
7 changes: 4 additions & 3 deletions imgui-sys/src/lib.rs
Expand Up @@ -59,7 +59,6 @@ pub enum ImGuiCol {
ScrollbarGrab,
ScrollbarGrabHovered,
ScrollbarGrabActive,
ComboBg,
CheckMark,
SliderGrab,
SliderGrabActive,
Expand All @@ -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] = &[
Expand All @@ -107,7 +109,6 @@ impl ImGuiCol {
ScrollbarGrab,
ScrollbarGrabHovered,
ScrollbarGrabActive,
ComboBg,
CheckMark,
SliderGrab,
SliderGrabActive,
Expand Down Expand Up @@ -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)]
Expand Down

0 comments on commit 5bf3eff

Please sign in to comment.