[cimgui 1.53.1] StyleVar: Add missing WindowBorderSize

Use WindowBorderSize as replacement for border boolean in window.rs
This commit is contained in:
Malik Olivier Boussejra 2018-05-14 11:50:13 +09:00
parent fc4245c303
commit 500e64d67e
4 changed files with 5 additions and 2 deletions

View File

@ -151,6 +151,7 @@ pub enum ImGuiStyleVar {
Alpha,
WindowPadding,
WindowRounding,
WindowBorderSize,
WindowMinSize,
ChildRounding,
ChildBorderSize,
@ -165,7 +166,7 @@ pub enum ImGuiStyleVar {
GrabMinSize,
ButtonTextAlign,
}
pub const ImGuiStyleVar_COUNT: usize = 16;
pub const ImGuiStyleVar_COUNT: usize = 17;
impl ImGuiStyleVar {
#[deprecated(since = "0.0.19", note = "please use ChildRounding instead")]

View File

@ -1202,6 +1202,7 @@ impl<'ui> Ui<'ui> {
Alpha(v) => unsafe { igPushStyleVar(ImGuiStyleVar::Alpha, v) },
WindowPadding(v) => unsafe { igPushStyleVarVec(ImGuiStyleVar::WindowPadding, v) },
WindowRounding(v) => unsafe { igPushStyleVar(ImGuiStyleVar::WindowRounding, v) },
WindowBorderSize(v) => unsafe { igPushStyleVar(ImGuiStyleVar::WindowBorderSize, v) },
WindowMinSize(v) => unsafe { igPushStyleVarVec(ImGuiStyleVar::WindowMinSize, v) },
ChildRounding(v) => unsafe {
igPushStyleVar(ImGuiStyleVar::ChildRounding, v)

View File

@ -5,6 +5,7 @@ pub enum StyleVar {
Alpha(f32),
WindowPadding(ImVec2),
WindowRounding(f32),
WindowBorderSize(f32),
WindowMinSize(ImVec2),
ChildRounding(f32),
ChildBorderSize(f32),

View File

@ -161,7 +161,7 @@ impl<'ui, 'p> Window<'ui, 'p> {
sys::igSetNextWindowSize(self.size.into(), self.size_cond);
}
if self.border {
sys::igPushStyleVar(ImGuiStyleVar::FrameBorderSize, 1.0);
sys::igPushStyleVar(ImGuiStyleVar::WindowBorderSize, 1.0);
}
sys::igBegin(
self.name.as_ptr(),