elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-11 13:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take ref_color by reference

Browse Source
This commit is contained in:
Joonas Javanainen 2017-11-04 10:44:16 +02:00
parent 484e413dda
commit 6ac40b1100
No known key found for this signature in database
GPG Key ID: D39CCA5CB19B9179
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imgui-examples/examples/test_window_impl.rs
View File

@ -505,7 +505,7 @@ fn show_test_window<'a>(ui: &Ui<'a>, state: &mut State, opened: &mut bool) {
.rgb(true);
if s.ref_color {
b = b.reference_color(s.ref_color_v)
b = b.reference_color(&s.ref_color_v)
}
b.build();
});

6
src/color_editors.rs
View File

@ -178,7 +178,7 @@ pub struct ColorPicker<'ui, 'p> {
label: &'p ImStr,
value: EditableColor<'p>,
flags: ImGuiColorEditFlags,
ref_color: Option<[f32; 4]>,
ref_color: Option<&'p [f32; 4]>,
_phantom: PhantomData<&'ui Ui<'ui>>,
}
@ -284,7 +284,7 @@ impl<'ui, 'p> ColorPicker<'ui, 'p> {
self
}
#[inline]
pub fn reference_color(mut self, ref_color: [f32; 4]) -> Self {
pub fn reference_color(mut self, ref_color: &'p [f32; 4]) -> Self {
self.ref_color = Some(ref_color);
self
}
@ -292,7 +292,7 @@ impl<'ui, 'p> ColorPicker<'ui, 'p> {
if let EditableColor::Float3(_) = self.value {
self.flags.insert(ImGuiColorEditFlags::NoAlpha);
}
let ref_color = self.ref_color.as_ref().map(|c| c.as_ptr()).unwrap_or(
let ref_color = self.ref_color.map(|c| c.as_ptr()).unwrap_or(
ptr::null(),
);
unsafe {