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

removed the lifetime from the majority of the library

Browse Source
This commit is contained in:
Jack Mac 2021-09-26 21:08:29 -04:00
parent 191a346545
commit 1d15196b5e
36 changed files with 155 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imgui/src/clipboard.rs
View File

@ -93,7 +93,7 @@ pub(crate) unsafe extern "C" fn set_clipboard_text(user_data: *mut c_void, text:
/// # Clipboard /// # Clipboard
#[allow(clippy::fn_address_comparisons)] // This is allowed because although function addresses wont be unique, we just care if its OURS #[allow(clippy::fn_address_comparisons)] // This is allowed because although function addresses wont be unique, we just care if its OURS
impl<'ui> Ui<'ui> { impl Ui {
/// Returns the current clipboard contents as text, or None if the clipboard is empty or cannot /// Returns the current clipboard contents as text, or None if the clipboard is empty or cannot
/// be accessed /// be accessed
pub fn clipboard_text(&self) -> Option<String> { pub fn clipboard_text(&self) -> Option<String> {

2
imgui/src/columns.rs
View File

@ -2,7 +2,7 @@ use crate::sys;
use crate::Ui; use crate::Ui;
/// # Columns /// # Columns
impl<'ui> Ui<'ui> { impl Ui {
#[doc(alias = "Columns")] #[doc(alias = "Columns")]
pub fn columns(&self, count: i32, id: impl AsRef<str>, border: bool) { pub fn columns(&self, count: i32, id: impl AsRef<str>, border: bool) {
unsafe { sys::igColumns(count, self.scratch_txt(id), border) } unsafe { sys::igColumns(count, self.scratch_txt(id), border) }

13
imgui/src/context.rs
View File

@ -60,6 +60,8 @@ pub struct Context {
// we also put it in an unsafecell since we're going to give // we also put it in an unsafecell since we're going to give
// imgui a mutable pointer to it. // imgui a mutable pointer to it.
clipboard_ctx: Box<UnsafeCell<ClipboardContext>>, clipboard_ctx: Box<UnsafeCell<ClipboardContext>>,
ui: Ui,
} }
// This mutex needs to be used to guard all public functions that can affect the underlying // This mutex needs to be used to guard all public functions that can affect the underlying
@ -241,6 +243,7 @@ impl Context {
platform_name: None, platform_name: None,
renderer_name: None, renderer_name: None,
clipboard_ctx: Box::new(ClipboardContext::dummy().into()), clipboard_ctx: Box::new(ClipboardContext::dummy().into()),
ui: Ui(()),
} }
} }
fn is_current_context(&self) -> bool { fn is_current_context(&self) -> bool {
@ -322,6 +325,7 @@ impl SuspendedContext {
platform_name: None, platform_name: None,
renderer_name: None, renderer_name: None,
clipboard_ctx: Box::new(ClipboardContext::dummy().into()), clipboard_ctx: Box::new(ClipboardContext::dummy().into()),
ui: Ui(()),
}; };
if ctx.is_current_context() { if ctx.is_current_context() {
// Oops, the context was activated -> deactivate // Oops, the context was activated -> deactivate
@ -515,7 +519,7 @@ impl Context {
/// Starts a new frame. /// Starts a new frame.
#[deprecated(since = "0.9.0", note = "use `new_frame` instead")] #[deprecated(since = "0.9.0", note = "use `new_frame` instead")]
pub fn frame(&mut self) -> Ui<'_> { pub fn frame(&mut self) -> &mut Ui {
self.new_frame() self.new_frame()
} }
@ -526,7 +530,7 @@ impl Context {
/// Panics if the context uses a shared font atlas that is already borrowed. /// Panics if the context uses a shared font atlas that is already borrowed.
/// Do not attempt to borrow the context afterwards, if you are using a shared font atlas. /// Do not attempt to borrow the context afterwards, if you are using a shared font atlas.
#[doc(alias = "NewFame")] #[doc(alias = "NewFame")]
pub fn new_frame(&mut self) -> Ui<'_> { pub fn new_frame(&mut self) -> &mut Ui {
// Clear default font if it no longer exists. This could be an error in the future // Clear default font if it no longer exists. This could be an error in the future
let default_font = self.io().font_default; let default_font = self.io().font_default;
if !default_font.is_null() && self.fonts().get_font(FontId(default_font)).is_none() { if !default_font.is_null() && self.fonts().get_font(FontId(default_font)).is_none() {
@ -540,8 +544,7 @@ impl Context {
unsafe { unsafe {
sys::igNewFrame(); sys::igNewFrame();
} }
Ui {
phantom_data: std::marker::PhantomData, &mut self.ui
}
} }
} }

12
imgui/src/drag_drop.rs
View File

@ -175,7 +175,7 @@ impl<T: AsRef<str>> DragDropSource<T> {
/// If you want to pass a simple integer or other "plain old data", take a look at /// If you want to pass a simple integer or other "plain old data", take a look at
/// [begin_payload](Self::begin_payload). /// [begin_payload](Self::begin_payload).
#[inline] #[inline]
pub fn begin<'ui>(self, ui: &Ui<'ui>) -> Option<DragDropSourceToolTip<'ui>> { pub fn begin<'ui>(self, ui: &Ui) -> Option<DragDropSourceToolTip<'ui>> {
self.begin_payload(ui, ()) self.begin_payload(ui, ())
} }
@ -224,7 +224,7 @@ impl<T: AsRef<str>> DragDropSource<T> {
#[inline] #[inline]
pub fn begin_payload<'ui, P: Copy + 'static>( pub fn begin_payload<'ui, P: Copy + 'static>(
self, self,
ui: &Ui<'ui>, ui: &Ui,
payload: P, payload: P,
) -> Option<DragDropSourceToolTip<'ui>> { ) -> Option<DragDropSourceToolTip<'ui>> {
unsafe { unsafe {
@ -266,7 +266,7 @@ impl<T: AsRef<str>> DragDropSource<T> {
#[inline] #[inline]
pub unsafe fn begin_payload_unchecked<'ui>( pub unsafe fn begin_payload_unchecked<'ui>(
&self, &self,
ui: &Ui<'ui>, ui: &Ui,
ptr: *const ffi::c_void, ptr: *const ffi::c_void,
size: usize, size: usize,
) -> Option<DragDropSourceToolTip<'ui>> { ) -> Option<DragDropSourceToolTip<'ui>> {
@ -283,7 +283,7 @@ impl<T: AsRef<str>> DragDropSource<T> {
} }
/// A helper struct for RAII drap-drop support. /// A helper struct for RAII drap-drop support.
pub struct DragDropSourceToolTip<'ui>(PhantomData<Ui<'ui>>); pub struct DragDropSourceToolTip<'ui>(PhantomData<&'ui Ui>);
impl DragDropSourceToolTip<'_> { impl DragDropSourceToolTip<'_> {
/// Creates a new tooltip internally. /// Creates a new tooltip internally.
@ -339,14 +339,14 @@ impl Drop for DragDropSourceToolTip<'_> {
/// on this struct. Each of these methods will spit out a _Payload struct with an increasing /// on this struct. Each of these methods will spit out a _Payload struct with an increasing
/// amount of information on the Payload. The absolute safest solution is [accept_payload_empty](Self::accept_payload_empty). /// amount of information on the Payload. The absolute safest solution is [accept_payload_empty](Self::accept_payload_empty).
#[derive(Debug)] #[derive(Debug)]
pub struct DragDropTarget<'ui>(&'ui Ui<'ui>); pub struct DragDropTarget<'ui>(&'ui Ui);
impl<'ui> DragDropTarget<'ui> { impl<'ui> DragDropTarget<'ui> {
/// Creates a new DragDropTarget, holding the [Ui]'s lifetime for the duration /// Creates a new DragDropTarget, holding the [Ui]'s lifetime for the duration
/// of its existence. This is required since this struct runs some code on its Drop /// of its existence. This is required since this struct runs some code on its Drop
/// to end the DragDropTarget code. /// to end the DragDropTarget code.
#[doc(alias = "BeginDragDropTarget")] #[doc(alias = "BeginDragDropTarget")]
pub fn new(ui: &'ui Ui<'ui>) -> Option<Self> { pub fn new(ui: &'ui Ui) -> Option<Self> {
let should_begin = unsafe { sys::igBeginDragDropTarget() }; let should_begin = unsafe { sys::igBeginDragDropTarget() };
if should_begin { if should_begin {
Some(Self(ui)) Some(Self(ui))

8
imgui/src/draw_list.rs
View File

@ -75,7 +75,7 @@ enum DrawListType {
pub struct DrawListMut<'ui> { pub struct DrawListMut<'ui> {
draw_list_type: DrawListType, draw_list_type: DrawListType,
draw_list: *mut ImDrawList, draw_list: *mut ImDrawList,
_phantom: PhantomData<&'ui Ui<'ui>>, _phantom: PhantomData<&'ui Ui>,
} }
// Lock for each variant of draw list. See https://github.com/imgui-rs/imgui-rs/issues/488 // Lock for each variant of draw list. See https://github.com/imgui-rs/imgui-rs/issues/488
@ -124,7 +124,7 @@ impl<'ui> DrawListMut<'ui> {
} }
#[doc(alias = "GetWindowDrawList")] #[doc(alias = "GetWindowDrawList")]
pub(crate) fn window(_: &Ui<'ui>) -> Self { pub(crate) fn window(_: &Ui) -> Self {
Self::lock_draw_list(DrawListType::Window); Self::lock_draw_list(DrawListType::Window);
Self { Self {
@ -135,7 +135,7 @@ impl<'ui> DrawListMut<'ui> {
} }
#[doc(alias = "GetBackgroundDrawList")] #[doc(alias = "GetBackgroundDrawList")]
pub(crate) fn background(_: &Ui<'ui>) -> Self { pub(crate) fn background(_: &Ui) -> Self {
Self::lock_draw_list(DrawListType::Background); Self::lock_draw_list(DrawListType::Background);
Self { Self {
draw_list: unsafe { sys::igGetBackgroundDrawList() }, draw_list: unsafe { sys::igGetBackgroundDrawList() },
@ -145,7 +145,7 @@ impl<'ui> DrawListMut<'ui> {
} }
#[doc(alias = "GetForegroundDrawList")] #[doc(alias = "GetForegroundDrawList")]
pub(crate) fn foreground(_: &Ui<'ui>) -> Self { pub(crate) fn foreground(_: &Ui) -> Self {
Self::lock_draw_list(DrawListType::Foreground); Self::lock_draw_list(DrawListType::Foreground);
Self { Self {
draw_list: unsafe { sys::igGetForegroundDrawList() }, draw_list: unsafe { sys::igGetForegroundDrawList() },

2
imgui/src/fonts/mod.rs
View File

@ -8,7 +8,7 @@ pub mod glyph;
pub mod glyph_ranges; pub mod glyph_ranges;
/// # Fonts /// # Fonts
impl<'ui> Ui<'ui> { impl Ui {
/// Returns the current font /// Returns the current font
#[doc(alias = "GetFont")] #[doc(alias = "GetFont")]
pub fn current_font(&self) -> &Font { pub fn current_font(&self) -> &Font {

2
imgui/src/input/keyboard.rs
View File

@ -91,7 +91,7 @@ impl FocusedWidget {
} }
/// # Input: Keyboard /// # Input: Keyboard
impl<'ui> Ui<'ui> { impl Ui {
/// Returns the key index of the given key identifier. /// Returns the key index of the given key identifier.
/// ///
/// Equivalent to indexing the Io struct `key_map` field: `ui.io().key_map[key]` /// Equivalent to indexing the Io struct `key_map` field: `ui.io().key_map[key]`

2
imgui/src/input/mouse.rs
View File

@ -89,7 +89,7 @@ fn test_mouse_cursor_variants() {
} }
/// # Input: Mouse /// # Input: Mouse
impl<'ui> Ui<'ui> { impl Ui {
/// Returns true if the given mouse button is held down. /// Returns true if the given mouse button is held down.
/// ///
/// Equivalent to indexing the Io struct with the button, e.g. `ui.io()[button]`. /// Equivalent to indexing the Io struct with the button, e.g. `ui.io()[button]`.

24
imgui/src/input_widget.rs
View File

@ -166,7 +166,7 @@ pub struct InputText<'ui, 'p, L, H = &'static str, T = PassthroughCallback> {
buf: &'p mut String, buf: &'p mut String,
callback_handler: T, callback_handler: T,
flags: InputTextFlags, flags: InputTextFlags,
ui: &'ui Ui<'ui>, ui: &'ui Ui,
} }
impl<'ui, 'p, L: AsRef<str>> InputText<'ui, 'p, L> { impl<'ui, 'p, L: AsRef<str>> InputText<'ui, 'p, L> {
@ -184,7 +184,7 @@ impl<'ui, 'p, L: AsRef<str>> InputText<'ui, 'p, L> {
/// your string. /// your string.
/// 3. Truncations by ImGui appear to be done primarily by insertions of `\0` to the truncation point. /// 3. Truncations by ImGui appear to be done primarily by insertions of `\0` to the truncation point.
/// We will handle this for you and edit the string "properly" too, but this might show up in callbacks. /// We will handle this for you and edit the string "properly" too, but this might show up in callbacks.
pub fn new(ui: &'ui Ui<'ui>, label: L, buf: &'p mut String) -> Self { pub fn new(ui: &'ui Ui, label: L, buf: &'p mut String) -> Self {
InputText { InputText {
label, label,
hint: None, hint: None,
@ -343,7 +343,7 @@ pub struct InputTextMultiline<'ui, 'p, L, T = PassthroughCallback> {
flags: InputTextFlags, flags: InputTextFlags,
size: [f32; 2], size: [f32; 2],
callback_handler: T, callback_handler: T,
ui: &'ui Ui<'ui>, ui: &'ui Ui,
} }
impl<'ui, 'p, L: AsRef<str>> InputTextMultiline<'ui, 'p, L, PassthroughCallback> { impl<'ui, 'p, L: AsRef<str>> InputTextMultiline<'ui, 'p, L, PassthroughCallback> {
@ -361,7 +361,7 @@ impl<'ui, 'p, L: AsRef<str>> InputTextMultiline<'ui, 'p, L, PassthroughCallback>
/// your string. /// your string.
/// 3. Truncations by ImGui appear to be done primarily by insertions of `\0` to the truncation point. /// 3. Truncations by ImGui appear to be done primarily by insertions of `\0` to the truncation point.
/// We will handle this for you and edit the string "properly" too, but this might show up in callbacks. /// We will handle this for you and edit the string "properly" too, but this might show up in callbacks.
pub fn new(ui: &'ui Ui<'ui>, label: L, buf: &'p mut String, size: impl Into<MintVec2>) -> Self { pub fn new(ui: &'ui Ui, label: L, buf: &'p mut String, size: impl Into<MintVec2>) -> Self {
InputTextMultiline { InputTextMultiline {
label, label,
buf, buf,
@ -482,11 +482,11 @@ pub struct InputInt<'ui, 'p, L> {
step: i32, step: i32,
step_fast: i32, step_fast: i32,
flags: InputTextFlags, flags: InputTextFlags,
ui: &'ui Ui<'ui>, ui: &'ui Ui,
} }
impl<'ui, 'p, L: AsRef<str>> InputInt<'ui, 'p, L> { impl<'ui, 'p, L: AsRef<str>> InputInt<'ui, 'p, L> {
pub fn new(ui: &'ui Ui<'ui>, label: L, value: &'p mut i32) -> Self { pub fn new(ui: &'ui Ui, label: L, value: &'p mut i32) -> Self {
InputInt { InputInt {
label, label,
value, value,
@ -520,11 +520,11 @@ pub struct InputFloat<'ui, 'p, L> {
step: f32, step: f32,
step_fast: f32, step_fast: f32,
flags: InputTextFlags, flags: InputTextFlags,
ui: &'ui Ui<'ui>, ui: &'ui Ui,
} }
impl<'ui, 'p, L: AsRef<str>> InputFloat<'ui, 'p, L> { impl<'ui, 'p, L: AsRef<str>> InputFloat<'ui, 'p, L> {
pub fn new(ui: &'ui Ui<'ui>, label: L, value: &'p mut f32) -> Self { pub fn new(ui: &'ui Ui, label: L, value: &'p mut f32) -> Self {
InputFloat { InputFloat {
label, label,
value, value,
@ -559,7 +559,7 @@ macro_rules! impl_input_floatn {
label: L, label: L,
value: &'p mut T, value: &'p mut T,
flags: InputTextFlags, flags: InputTextFlags,
ui: &'ui Ui<'ui>, ui: &'ui Ui,
} }
impl<'ui, 'p, L, T> $InputFloatN<'ui, 'p, L, T> impl<'ui, 'p, L, T> $InputFloatN<'ui, 'p, L, T>
@ -568,7 +568,7 @@ macro_rules! impl_input_floatn {
T: Copy + Into<$MINT_TARGET>, T: Copy + Into<$MINT_TARGET>,
$MINT_TARGET: Into<T> + Into<[f32; $N]>, $MINT_TARGET: Into<T> + Into<[f32; $N]>,
{ {
pub fn new(ui: &'ui Ui<'ui>, label: L, value: &'p mut T) -> Self { pub fn new(ui: &'ui Ui, label: L, value: &'p mut T) -> Self {
$InputFloatN { $InputFloatN {
label, label,
value, value,
@ -614,7 +614,7 @@ macro_rules! impl_input_intn {
label: L, label: L,
value: &'p mut T, value: &'p mut T,
flags: InputTextFlags, flags: InputTextFlags,
ui: &'ui Ui<'ui>, ui: &'ui Ui,
} }
impl<'ui, 'p, L, T> $InputIntN<'ui, 'p, L, T> impl<'ui, 'p, L, T> $InputIntN<'ui, 'p, L, T>
@ -623,7 +623,7 @@ macro_rules! impl_input_intn {
T: Copy + Into<$MINT_TARGET>, T: Copy + Into<$MINT_TARGET>,
$MINT_TARGET: Into<T> + Into<[i32; $N]>, $MINT_TARGET: Into<T> + Into<[i32; $N]>,
{ {
pub fn new(ui: &'ui Ui<'ui>, label: L, value: &'p mut T) -> Self { pub fn new(ui: &'ui Ui, label: L, value: &'p mut T) -> Self {
$InputIntN { $InputIntN {
label, label,
value, value,

2
imgui/src/layout.rs
View File

@ -12,7 +12,7 @@ create_token!(
); );
/// # Cursor / Layout /// # Cursor / Layout
impl<'ui> Ui<'ui> { impl Ui {
/// Renders a separator (generally horizontal). /// Renders a separator (generally horizontal).
/// ///
/// This becomes a vertical separator inside a menu bar or in horizontal layout mode. /// This becomes a vertical separator inside a menu bar or in horizontal layout mode.

73
imgui/src/lib.rs
View File

@ -118,9 +118,7 @@ impl Context {
/// A temporary reference for building the user interface for one frame /// A temporary reference for building the user interface for one frame
#[derive(Debug)] #[derive(Debug)]
pub struct Ui<'ui> { pub struct Ui(pub(crate) ());
phantom_data: std::marker::PhantomData<&'ui Context>,
}
/// This is our internal buffer that we use for the Ui object. /// This is our internal buffer that we use for the Ui object.
/// ///
@ -128,7 +126,7 @@ pub struct Ui<'ui> {
static mut BUFFER: cell::UnsafeCell<string::UiBuffer> = static mut BUFFER: cell::UnsafeCell<string::UiBuffer> =
cell::UnsafeCell::new(string::UiBuffer::new(100)); cell::UnsafeCell::new(string::UiBuffer::new(100));
impl<'ui> Ui<'ui> { impl Ui {
/// This provides access to the backing scratch buffer that we use to write /// This provides access to the backing scratch buffer that we use to write
/// strings, along with null-terminators, before we pass normal Rust strs to /// strings, along with null-terminators, before we pass normal Rust strs to
/// Dear ImGui. /// Dear ImGui.
@ -198,29 +196,30 @@ impl<'ui> Ui<'ui> {
pub fn clone_style(&self) -> Style { pub fn clone_style(&self) -> Style {
unsafe { *self.style() } unsafe { *self.style() }
} }
/// Renders the frame and returns a reference to the resulting draw data // /// Renders the frame and returns a reference to the resulting draw data
#[doc(alias = "Render", alias = "GetDrawData")] // #[doc(alias = "Render", alias = "GetDrawData")]
pub fn render(self) -> &'ui DrawData { // pub fn render(self) -> &DrawData {
unsafe { // unsafe {
sys::igRender(); // sys::igRender();
&*(sys::igGetDrawData() as *mut DrawData) // &*(sys::igGetDrawData() as *mut DrawData)
} // }
} // }
} }
impl<'a> Drop for Ui<'a> { // TODO JACK YOU NEED TO MOVE THIS!
#[doc(alias = "EndFrame")] // impl Drop for Ui {
fn drop(&mut self) { // #[doc(alias = "EndFrame")]
if !std::thread::panicking() { // fn drop(&mut self) {
unsafe { // if !std::thread::panicking() {
sys::igEndFrame(); // unsafe {
} // sys::igEndFrame();
} // }
} // }
} // }
// }
/// # Demo, debug, information /// # Demo, debug, information
impl<'ui> Ui<'ui> { impl Ui {
/// Renders a demo window (previously called a test window), which demonstrates most /// Renders a demo window (previously called a test window), which demonstrates most
/// Dear Imgui features. /// Dear Imgui features.
#[doc(alias = "ShowDemoWindow")] #[doc(alias = "ShowDemoWindow")]
@ -331,7 +330,7 @@ impl<'a> Default for Id<'a> {
} }
} }
impl<'ui> Ui<'ui> { impl Ui {
/// # Windows /// # Windows
/// Start constructing a window. /// Start constructing a window.
/// ///
@ -353,7 +352,7 @@ impl<'ui> Ui<'ui> {
/// ui.text("An example"); /// ui.text("An example");
/// }); /// });
/// ``` /// ```
pub fn window<Label: AsRef<str>>(&'ui self, name: Label) -> Window<'ui, '_, Label> { pub fn window<Label: AsRef<str>>(&self, name: Label) -> Window<'_, '_, Label> {
Window::new(self, name) Window::new(self, name)
} }
@ -372,13 +371,13 @@ impl<'ui> Ui<'ui> {
/// wt.unwrap().end() /// wt.unwrap().end()
/// } /// }
/// ``` /// ```
pub fn child_window<Label: AsRef<str>>(&'ui self, name: Label) -> ChildWindow<'ui, Label> { pub fn child_window<Label: AsRef<str>>(&self, name: Label) -> ChildWindow<'_, Label> {
ChildWindow::new(self, name) ChildWindow::new(self, name)
} }
} }
// Widgets: Input // Widgets: Input
impl<'ui> Ui<'ui> { impl<'ui> Ui {
#[doc(alias = "InputText", alias = "InputTextWithHint")] #[doc(alias = "InputText", alias = "InputTextWithHint")]
pub fn input_text<'p, L: AsRef<str>>( pub fn input_text<'p, L: AsRef<str>>(
&'ui self, &'ui self,
@ -490,7 +489,7 @@ create_token!(
); );
/// # Tooltips /// # Tooltips
impl<'ui> Ui<'ui> { impl Ui {
/// Construct a tooltip window that can have any kind of content. /// Construct a tooltip window that can have any kind of content.
/// ///
/// Typically used with `Ui::is_item_hovered()` or some other conditional check. /// Typically used with `Ui::is_item_hovered()` or some other conditional check.
@ -557,7 +556,7 @@ create_token!(
/// imgui can disable widgets so they don't react to mouse/keyboard /// imgui can disable widgets so they don't react to mouse/keyboard
/// inputs, and are displayed differently (currently dimmed by an /// inputs, and are displayed differently (currently dimmed by an
/// amount set in [`Style::disabled_alpha`]) /// amount set in [`Style::disabled_alpha`])
impl<'ui> Ui<'ui> { impl Ui {
/// Creates a scope where interactions are disabled. /// Creates a scope where interactions are disabled.
/// ///
/// Scope ends when returned token is dropped, or `.end()` is /// Scope ends when returned token is dropped, or `.end()` is
@ -619,7 +618,7 @@ impl<'ui> Ui<'ui> {
} }
// Widgets: ListBox // Widgets: ListBox
impl<'ui> Ui<'ui> { impl Ui {
#[doc(alias = "ListBox")] #[doc(alias = "ListBox")]
pub fn list_box<'p, StringType: AsRef<str> + ?Sized>( pub fn list_box<'p, StringType: AsRef<str> + ?Sized>(
&self, &self,
@ -686,7 +685,7 @@ impl<'ui> Ui<'ui> {
// } // }
} }
impl<'ui> Ui<'ui> { impl<'ui> Ui {
#[doc(alias = "PlotLines")] #[doc(alias = "PlotLines")]
pub fn plot_lines<'p, Label: AsRef<str>>( pub fn plot_lines<'p, Label: AsRef<str>>(
&'ui self, &'ui self,
@ -695,9 +694,7 @@ impl<'ui> Ui<'ui> {
) -> PlotLines<'ui, 'p, Label> { ) -> PlotLines<'ui, 'p, Label> {
PlotLines::new(self, label, values) PlotLines::new(self, label, values)
} }
}
impl<'ui> Ui<'ui> {
#[doc(alias = "PlotHistogram")] #[doc(alias = "PlotHistogram")]
pub fn plot_histogram<'p, Label: AsRef<str>>( pub fn plot_histogram<'p, Label: AsRef<str>>(
&'ui self, &'ui self,
@ -706,9 +703,7 @@ impl<'ui> Ui<'ui> {
) -> PlotHistogram<'ui, 'p, Label> { ) -> PlotHistogram<'ui, 'p, Label> {
PlotHistogram::new(self, label, values) PlotHistogram::new(self, label, values)
} }
}
impl<'ui> Ui<'ui> {
/// Calculate the size required for a given text string. /// Calculate the size required for a given text string.
/// ///
/// This is the same as [calc_text_size_with_opts](Self::calc_text_size_with_opts) /// This is the same as [calc_text_size_with_opts](Self::calc_text_size_with_opts)
@ -751,7 +746,7 @@ impl<'ui> Ui<'ui> {
} }
/// # Draw list for custom drawing /// # Draw list for custom drawing
impl<'ui> Ui<'ui> { impl Ui {
/// Get access to drawing API /// Get access to drawing API
/// ///
/// # Examples /// # Examples
@ -783,19 +778,19 @@ impl<'ui> Ui<'ui> {
/// ``` /// ```
#[must_use] #[must_use]
#[doc(alias = "GetWindowDrawList")] #[doc(alias = "GetWindowDrawList")]
pub fn get_window_draw_list(&'ui self) -> DrawListMut<'ui> { pub fn get_window_draw_list(&self) -> DrawListMut<'_> {
DrawListMut::window(self) DrawListMut::window(self)
} }
#[must_use] #[must_use]
#[doc(alias = "GetBackgroundDrawList")] #[doc(alias = "GetBackgroundDrawList")]
pub fn get_background_draw_list(&'ui self) -> DrawListMut<'ui> { pub fn get_background_draw_list(&self) -> DrawListMut<'_> {
DrawListMut::background(self) DrawListMut::background(self)
} }
#[must_use] #[must_use]
#[doc(alias = "GetForegroundDrawList")] #[doc(alias = "GetForegroundDrawList")]
pub fn get_foreground_draw_list(&'ui self) -> DrawListMut<'ui> { pub fn get_foreground_draw_list(&self) -> DrawListMut<'_> {
DrawListMut::foreground(self) DrawListMut::foreground(self)
} }
} }

6
imgui/src/list_clipper.rs
View File

@ -22,7 +22,7 @@ impl ListClipper {
self self
} }
pub fn begin<'ui>(self, ui: &Ui<'ui>) -> ListClipperToken<'ui> { pub fn begin(self, ui: &Ui) -> ListClipperToken<'_> {
let list_clipper = unsafe { let list_clipper = unsafe {
let list_clipper = sys::ImGuiListClipper_ImGuiListClipper(); let list_clipper = sys::ImGuiListClipper_ImGuiListClipper();
sys::ImGuiListClipper_Begin(list_clipper, self.items_count, self.items_height); sys::ImGuiListClipper_Begin(list_clipper, self.items_count, self.items_height);
@ -34,11 +34,11 @@ impl ListClipper {
pub struct ListClipperToken<'ui> { pub struct ListClipperToken<'ui> {
list_clipper: *mut sys::ImGuiListClipper, list_clipper: *mut sys::ImGuiListClipper,
_phantom: PhantomData<&'ui Ui<'ui>>, _phantom: PhantomData<&'ui Ui>,
} }
impl<'ui> ListClipperToken<'ui> { impl<'ui> ListClipperToken<'ui> {
fn new(_: &Ui<'ui>, list_clipper: *mut sys::ImGuiListClipper) -> Self { fn new(_: &Ui, list_clipper: *mut sys::ImGuiListClipper) -> Self {
Self { Self {
list_clipper, list_clipper,
_phantom: PhantomData, _phantom: PhantomData,

4
imgui/src/plothistogram.rs
View File

@ -12,11 +12,11 @@ pub struct PlotHistogram<'ui, 'p, Label, Overlay = &'static str> {
scale_min: f32, scale_min: f32,
scale_max: f32, scale_max: f32,
graph_size: [f32; 2], graph_size: [f32; 2],
ui: &'ui Ui<'ui>, ui: &'ui Ui,
} }
impl<'ui, 'p, Label: AsRef<str>> PlotHistogram<'ui, 'p, Label> { impl<'ui, 'p, Label: AsRef<str>> PlotHistogram<'ui, 'p, Label> {
pub fn new(ui: &'ui Ui<'ui>, label: Label, values: &'p [f32]) -> Self { pub fn new(ui: &'ui Ui, label: Label, values: &'p [f32]) -> Self {
PlotHistogram { PlotHistogram {
label, label,
values, values,

4
imgui/src/plotlines.rs
View File

@ -12,11 +12,11 @@ pub struct PlotLines<'ui, 'p, Label, Overlay = &'static str> {
scale_min: f32, scale_min: f32,
scale_max: f32, scale_max: f32,
graph_size: [f32; 2], graph_size: [f32; 2],
ui: &'ui Ui<'ui>, ui: &'ui Ui,
} }
impl<'ui, 'p, Label: AsRef<str>> PlotLines<'ui, 'p, Label> { impl<'ui, 'p, Label: AsRef<str>> PlotLines<'ui, 'p, Label> {
pub fn new(ui: &'ui Ui<'ui>, label: Label, values: &'p [f32]) -> Self { pub fn new(ui: &'ui Ui, label: Label, values: &'p [f32]) -> Self {
PlotLines { PlotLines {
label, label,
values, values,

6
imgui/src/popups.rs
View File

@ -118,7 +118,7 @@ impl<'p, Label: AsRef<str>> PopupModal<'p, Label> {
/// Consume and draw the PopupModal. /// Consume and draw the PopupModal.
/// Returns the result of the closure, if it is called. /// Returns the result of the closure, if it is called.
#[doc(alias = "BeginPopupModal")] #[doc(alias = "BeginPopupModal")]
pub fn build<T, F: FnOnce() -> T>(self, ui: &Ui<'_>, f: F) -> Option<T> { pub fn build<T, F: FnOnce() -> T>(self, ui: &Ui, f: F) -> Option<T> {
self.begin_popup(ui).map(|_popup| f()) self.begin_popup(ui).map(|_popup| f())
} }
@ -128,7 +128,7 @@ impl<'p, Label: AsRef<str>> PopupModal<'p, Label> {
/// This should be called *per frame*, whereas [`Ui::open_popup`] /// This should be called *per frame*, whereas [`Ui::open_popup`]
/// should be called *once* when you want to actual create the popup. /// should be called *once* when you want to actual create the popup.
#[doc(alias = "BeginPopupModal")] #[doc(alias = "BeginPopupModal")]
pub fn begin_popup<'ui>(self, ui: &Ui<'ui>) -> Option<PopupToken<'ui>> { pub fn begin_popup(self, ui: &Ui) -> Option<PopupToken<'_>> {
let render = unsafe { let render = unsafe {
sys::igBeginPopupModal( sys::igBeginPopupModal(
ui.scratch_txt(self.label), ui.scratch_txt(self.label),
@ -148,7 +148,7 @@ impl<'p, Label: AsRef<str>> PopupModal<'p, Label> {
} }
// Widgets: Popups // Widgets: Popups
impl<'ui> Ui<'ui> { impl Ui {
/// Instructs ImGui to open a popup, which must be began with either [`begin_popup`](Self::begin_popup) /// Instructs ImGui to open a popup, which must be began with either [`begin_popup`](Self::begin_popup)
/// or [`popup`](Self::popup). You also use this function to begin [PopupModal]. /// or [`popup`](Self::popup). You also use this function to begin [PopupModal].
/// ///

12
imgui/src/stacks.rs
View File

@ -8,7 +8,7 @@ use std::mem;
use std::os::raw::{c_char, c_void}; use std::os::raw::{c_char, c_void};
/// # Parameter stacks (shared) /// # Parameter stacks (shared)
impl<'ui> Ui<'ui> { impl Ui {
/// Switches to the given font by pushing it to the font stack. /// Switches to the given font by pushing it to the font stack.
/// ///
/// Returns a `FontStackToken` that must be popped by calling `.pop()` /// Returns a `FontStackToken` that must be popped by calling `.pop()`
@ -177,7 +177,7 @@ unsafe fn push_style_var(style_var: StyleVar) {
} }
/// # Parameter stacks (current window) /// # Parameter stacks (current window)
impl<'ui> Ui<'ui> { impl Ui {
/// Changes the item width by pushing a change to the item width stack. /// Changes the item width by pushing a change to the item width stack.
/// ///
/// Returns an `ItemWidthStackToken` that may be popped by calling `.pop()` /// Returns an `ItemWidthStackToken` that may be popped by calling `.pop()`
@ -337,13 +337,13 @@ create_token!(
/// ImGui equivalent. We're phasing these out to make imgui-rs feel simpler to use. /// ImGui equivalent. We're phasing these out to make imgui-rs feel simpler to use.
#[must_use] #[must_use]
pub struct ItemFlagsStackToken<'a>( pub struct ItemFlagsStackToken<'a>(
std::marker::PhantomData<Ui<'a>>, std::marker::PhantomData<&'a Ui>,
mem::Discriminant<ItemFlag>, mem::Discriminant<ItemFlag>,
); );
impl<'a> ItemFlagsStackToken<'a> { impl<'a> ItemFlagsStackToken<'a> {
/// Creates a new token type. /// Creates a new token type.
pub(crate) fn new(_: &crate::Ui<'a>, kind: ItemFlag) -> Self { pub(crate) fn new(_: &'a crate::Ui, kind: ItemFlag) -> Self {
Self(std::marker::PhantomData, mem::discriminant(&kind)) Self(std::marker::PhantomData, mem::discriminant(&kind))
} }
@ -384,7 +384,7 @@ impl IdStackToken<'_> {
} }
/// # ID stack /// # ID stack
impl<'ui> Ui<'ui> { impl<'ui> Ui {
/// Pushes an identifier to the ID stack. /// Pushes an identifier to the ID stack.
/// This can be called with an integer, a string, or a pointer. /// This can be called with an integer, a string, or a pointer.
/// ///
@ -462,7 +462,7 @@ impl<'ui> Ui<'ui> {
/// }); /// });
/// ``` /// ```
#[doc(alias = "PushId")] #[doc(alias = "PushId")]
pub fn push_id<'a, I: Into<Id<'a>>>(&self, id: I) -> IdStackToken<'ui> { pub fn push_id<'a, I: Into<Id<'a>>>(&'ui self, id: I) -> IdStackToken<'ui> {
let id = id.into(); let id = id.into();
unsafe { unsafe {

16
imgui/src/tables.rs
View File

@ -249,7 +249,7 @@ pub enum TableSortDirection {
Descending, Descending,
} }
impl<'ui> Ui<'ui> { impl Ui {
/// Begins a table with no flags and with standard sizing contraints. /// Begins a table with no flags and with standard sizing contraints.
/// ///
/// This does no work on styling the headers (the top row) -- see either /// This does no work on styling the headers (the top row) -- see either
@ -263,7 +263,7 @@ impl<'ui> Ui<'ui> {
&self, &self,
str_id: impl AsRef<str>, str_id: impl AsRef<str>,
column_count: usize, column_count: usize,
) -> Option<TableToken<'ui>> { ) -> Option<TableToken<'_>> {
self.begin_table_with_flags(str_id, column_count, TableFlags::empty()) self.begin_table_with_flags(str_id, column_count, TableFlags::empty())
} }
@ -281,7 +281,7 @@ impl<'ui> Ui<'ui> {
str_id: impl AsRef<str>, str_id: impl AsRef<str>,
column_count: usize, column_count: usize,
flags: TableFlags, flags: TableFlags,
) -> Option<TableToken<'ui>> { ) -> Option<TableToken<'_>> {
self.begin_table_with_sizing(str_id, column_count, flags, [0.0, 0.0], 0.0) self.begin_table_with_sizing(str_id, column_count, flags, [0.0, 0.0], 0.0)
} }
@ -302,7 +302,7 @@ impl<'ui> Ui<'ui> {
flags: TableFlags, flags: TableFlags,
outer_size: [f32; 2], outer_size: [f32; 2],
inner_width: f32, inner_width: f32,
) -> Option<TableToken<'ui>> { ) -> Option<TableToken<'_>> {
unsafe { unsafe {
sys::igBeginTable( sys::igBeginTable(
self.scratch_txt(str_id), self.scratch_txt(str_id),
@ -324,7 +324,7 @@ impl<'ui> Ui<'ui> {
&self, &self,
str_id: impl AsRef<str>, str_id: impl AsRef<str>,
column_data: [TableColumnSetup<'a, Name>; N], column_data: [TableColumnSetup<'a, Name>; N],
) -> Option<TableToken<'ui>> { ) -> Option<TableToken<'_>> {
self.begin_table_header_with_flags(str_id, column_data, TableFlags::empty()) self.begin_table_header_with_flags(str_id, column_data, TableFlags::empty())
} }
@ -338,7 +338,7 @@ impl<'ui> Ui<'ui> {
str_id: impl AsRef<str>, str_id: impl AsRef<str>,
column_data: [TableColumnSetup<'a, Name>; N], column_data: [TableColumnSetup<'a, Name>; N],
flags: TableFlags, flags: TableFlags,
) -> Option<TableToken<'ui>> { ) -> Option<TableToken<'_>> {
self.begin_table_header_with_sizing(str_id, column_data, flags, [0.0, 0.0], 0.0) self.begin_table_header_with_sizing(str_id, column_data, flags, [0.0, 0.0], 0.0)
} }
@ -354,7 +354,7 @@ impl<'ui> Ui<'ui> {
flags: TableFlags, flags: TableFlags,
outer_size: [f32; 2], outer_size: [f32; 2],
inner_width: f32, inner_width: f32,
) -> Option<TableToken<'ui>> { ) -> Option<TableToken<'_>> {
self.begin_table_with_sizing(str_id, N, flags, outer_size, inner_width) self.begin_table_with_sizing(str_id, N, flags, outer_size, inner_width)
.map(|data| { .map(|data| {
for value in column_data { for value in column_data {
@ -769,7 +769,7 @@ impl<'a, Name: AsRef<str>> TableColumnSetup<'a, Name> {
/// [should_sort]: Self::should_sort /// [should_sort]: Self::should_sort
/// [specs]: Self::specs /// [specs]: Self::specs
/// [set_sorted]: Self::set_sorted /// [set_sorted]: Self::set_sorted
pub struct TableSortSpecsMut<'ui>(*mut sys::ImGuiTableSortSpecs, PhantomData<Ui<'ui>>); pub struct TableSortSpecsMut<'ui>(*mut sys::ImGuiTableSortSpecs, PhantomData<&'ui Ui>);
impl TableSortSpecsMut<'_> { impl TableSortSpecsMut<'_> {
/// Gets the specs for a given sort. In most scenarios, this will be a slice of 1 entry. /// Gets the specs for a given sort. In most scenarios, this will be a slice of 1 entry.

4
imgui/src/tokens.rs
View File

@ -19,11 +19,11 @@ macro_rules! create_token {
) => { ) => {
#[must_use] #[must_use]
$(#[$struct_meta])* $(#[$struct_meta])*
pub struct $token_name<'a>($crate::__core::marker::PhantomData<crate::Ui<'a>>); pub struct $token_name<'a>($crate::__core::marker::PhantomData<&'a crate::Ui>);
impl<'a> $token_name<'a> { impl<'a> $token_name<'a> {
/// Creates a new token type. /// Creates a new token type.
pub(crate) fn new(_: &crate::Ui<'a>) -> Self { pub(crate) fn new(_: &'a crate::Ui) -> Self {
Self(std::marker::PhantomData) Self(std::marker::PhantomData)
} }

4
imgui/src/utils.rs
View File

@ -25,7 +25,7 @@ bitflags! {
} }
/// # Item/widget utilities /// # Item/widget utilities
impl<'ui> Ui<'ui> { impl Ui {
/// Returns `true` if the last item is hovered /// Returns `true` if the last item is hovered
#[doc(alias = "IsItemHovered")] #[doc(alias = "IsItemHovered")]
pub fn is_item_hovered(&self) -> bool { pub fn is_item_hovered(&self) -> bool {
@ -142,7 +142,7 @@ impl<'ui> Ui<'ui> {
} }
/// # Miscellaneous utilities /// # Miscellaneous utilities
impl<'ui> Ui<'ui> { impl Ui {
/// Returns `true` if the rectangle (of given size, starting from cursor position) is visible /// Returns `true` if the rectangle (of given size, starting from cursor position) is visible
#[doc(alias = "IsRectVisibleNil")] #[doc(alias = "IsRectVisibleNil")]
pub fn is_cursor_rect_visible(&self, size: impl Into<MintVec2>) -> bool { pub fn is_cursor_rect_visible(&self, size: impl Into<MintVec2>) -> bool {

12
imgui/src/widget/color_editors.rs
View File

@ -326,7 +326,7 @@ where
/// Builds the color editor. /// Builds the color editor.
/// ///
/// Returns true if the color value was changed. /// Returns true if the color value was changed.
pub fn build(mut self, ui: &Ui<'_>) -> bool { pub fn build(mut self, ui: &Ui) -> bool {
// if let EditableColor::Float3(_) = self.value { // if let EditableColor::Float3(_) = self.value {
self.flags.insert(ColorEditFlags::NO_ALPHA); self.flags.insert(ColorEditFlags::NO_ALPHA);
@ -508,7 +508,7 @@ where
/// Builds the color editor. /// Builds the color editor.
/// ///
/// Returns true if the color value was changed. /// Returns true if the color value was changed.
pub fn build(self, ui: &Ui<'_>) -> bool { pub fn build(self, ui: &Ui) -> bool {
let as_vec4: MintVec4 = (*self.value).into(); let as_vec4: MintVec4 = (*self.value).into();
let mut as_vec4: [f32; 4] = as_vec4.into(); let mut as_vec4: [f32; 4] = as_vec4.into();
@ -694,7 +694,7 @@ where
/// Builds the color picker. /// Builds the color picker.
/// ///
/// Returns true if the color value was changed. /// Returns true if the color value was changed.
pub fn build(mut self, ui: &Ui<'_>) -> bool { pub fn build(mut self, ui: &Ui) -> bool {
self.flags.insert(ColorEditFlags::NO_ALPHA); self.flags.insert(ColorEditFlags::NO_ALPHA);
let mut value: [f32; 3] = (*self.value).into().into(); let mut value: [f32; 3] = (*self.value).into().into();
let changed = unsafe { let changed = unsafe {
@ -886,7 +886,7 @@ where
/// Builds the color picker. /// Builds the color picker.
/// ///
/// Returns true if the color value was changed. /// Returns true if the color value was changed.
pub fn build(mut self, ui: &Ui<'_>) -> bool { pub fn build(mut self, ui: &Ui) -> bool {
self.flags.insert(ColorEditFlags::NO_ALPHA); self.flags.insert(ColorEditFlags::NO_ALPHA);
let mut value: [f32; 4] = (*self.value).into().into(); let mut value: [f32; 4] = (*self.value).into().into();
let ref_color = self.ref_color.map(|c| c.as_ptr()).unwrap_or(ptr::null()); let ref_color = self.ref_color.map(|c| c.as_ptr()).unwrap_or(ptr::null());
@ -1009,7 +1009,7 @@ impl<T: AsRef<str>> ColorButton<T> {
/// Builds the color button. /// Builds the color button.
/// ///
/// Returns true if this color button was clicked. /// Returns true if this color button was clicked.
pub fn build(self, ui: &Ui<'_>) -> bool { pub fn build(self, ui: &Ui) -> bool {
unsafe { unsafe {
sys::igColorButton( sys::igColorButton(
ui.scratch_txt(self.desc_id), ui.scratch_txt(self.desc_id),
@ -1022,7 +1022,7 @@ impl<T: AsRef<str>> ColorButton<T> {
} }
/// # Widgets: Color Editor/Picker /// # Widgets: Color Editor/Picker
impl<'ui> Ui<'ui> { impl Ui {
/// Initializes current color editor/picker options (generally on application startup) if you /// Initializes current color editor/picker options (generally on application startup) if you
/// want to select a default format, picker type, etc. Users will be able to change many /// want to select a default format, picker type, etc. Users will be able to change many
/// settings, unless you use .options(false) in your widget builders. /// settings, unless you use .options(false) in your widget builders.

16
imgui/src/widget/combo_box.rs
View File

@ -142,7 +142,7 @@ impl<T: AsRef<str>, Preview: AsRef<str>> ComboBox<T, Preview> {
/// ///
/// Returns `None` if the combo box is not open and no content should be rendered. /// Returns `None` if the combo box is not open and no content should be rendered.
#[must_use] #[must_use]
pub fn begin<'ui>(self, ui: &Ui<'ui>) -> Option<ComboBoxToken<'ui>> { pub fn begin(self, ui: &Ui) -> Option<ComboBoxToken<'_>> {
let should_render = unsafe { let should_render = unsafe {
if let Some(preview_value) = self.preview_value { if let Some(preview_value) = self.preview_value {
let (ptr_one, ptr_two) = ui.scratch_txt_two(self.label, preview_value); let (ptr_one, ptr_two) = ui.scratch_txt_two(self.label, preview_value);
@ -162,7 +162,7 @@ impl<T: AsRef<str>, Preview: AsRef<str>> ComboBox<T, Preview> {
/// Returns the result of the closure, if it is called. /// Returns the result of the closure, if it is called.
/// ///
/// Note: the closure is not called if the combo box is not open. /// Note: the closure is not called if the combo box is not open.
pub fn build<R, F: FnOnce() -> R>(self, ui: &Ui<'_>, f: F) -> Option<R> { pub fn build<R, F: FnOnce() -> R>(self, ui: &Ui, f: F) -> Option<R> {
self.begin(ui).map(|_combo| f()) self.begin(ui).map(|_combo| f())
} }
} }
@ -177,7 +177,7 @@ create_token!(
); );
/// # Convenience functions /// # Convenience functions
impl<'ui> Ui<'ui> { impl Ui {
/// Creates a combo box which can be appended to with `Selectable::new`. /// Creates a combo box which can be appended to with `Selectable::new`.
/// ///
/// If you do not want to provide a preview, use [`begin_combo_no_preview`]. If you want /// If you do not want to provide a preview, use [`begin_combo_no_preview`]. If you want
@ -193,7 +193,7 @@ impl<'ui> Ui<'ui> {
&self, &self,
label: impl AsRef<str>, label: impl AsRef<str>,
preview_value: impl AsRef<str>, preview_value: impl AsRef<str>,
) -> Option<ComboBoxToken<'ui>> { ) -> Option<ComboBoxToken<'_>> {
self.begin_combo_with_flags(label, preview_value, ComboBoxFlags::empty()) self.begin_combo_with_flags(label, preview_value, ComboBoxFlags::empty())
} }
@ -213,7 +213,7 @@ impl<'ui> Ui<'ui> {
label: impl AsRef<str>, label: impl AsRef<str>,
preview_value: impl AsRef<str>, preview_value: impl AsRef<str>,
flags: ComboBoxFlags, flags: ComboBoxFlags,
) -> Option<ComboBoxToken<'ui>> { ) -> Option<ComboBoxToken<'_>> {
self._begin_combo(label, Some(preview_value), flags) self._begin_combo(label, Some(preview_value), flags)
} }
@ -231,7 +231,7 @@ impl<'ui> Ui<'ui> {
/// [begin_combo_no_preview_with_flags]: Ui::begin_combo_no_preview_with_flags /// [begin_combo_no_preview_with_flags]: Ui::begin_combo_no_preview_with_flags
#[must_use] #[must_use]
#[doc(alias = "BeginCombo")] #[doc(alias = "BeginCombo")]
pub fn begin_combo_no_preview(&self, label: impl AsRef<str>) -> Option<ComboBoxToken<'ui>> { pub fn begin_combo_no_preview(&self, label: impl AsRef<str>) -> Option<ComboBoxToken<'_>> {
self.begin_combo_no_preview_with_flags(label, ComboBoxFlags::empty()) self.begin_combo_no_preview_with_flags(label, ComboBoxFlags::empty())
} }
@ -250,7 +250,7 @@ impl<'ui> Ui<'ui> {
&self, &self,
label: impl AsRef<str>, label: impl AsRef<str>,
flags: ComboBoxFlags, flags: ComboBoxFlags,
) -> Option<ComboBoxToken<'ui>> { ) -> Option<ComboBoxToken<'_>> {
self._begin_combo(label, Option::<&'static str>::None, flags) self._begin_combo(label, Option::<&'static str>::None, flags)
} }
@ -260,7 +260,7 @@ impl<'ui> Ui<'ui> {
label: impl AsRef<str>, label: impl AsRef<str>,
preview_value: Option<impl AsRef<str>>, preview_value: Option<impl AsRef<str>>,
flags: ComboBoxFlags, flags: ComboBoxFlags,
) -> Option<ComboBoxToken<'ui>> { ) -> Option<ComboBoxToken<'_>> {
let should_render = unsafe { let should_render = unsafe {
let (ptr_one, ptr_two) = self.scratch_txt_with_opt(label, preview_value); let (ptr_one, ptr_two) = self.scratch_txt_with_opt(label, preview_value);
sys::igBeginCombo(ptr_one, ptr_two, flags.bits() as i32) sys::igBeginCombo(ptr_one, ptr_two, flags.bits() as i32)

8
imgui/src/widget/drag.rs
View File

@ -66,7 +66,7 @@ impl<L: AsRef<str>, T: DataTypeKind, F: AsRef<str>> Drag<T, L, F> {
/// Builds a drag slider that is bound to the given value. /// Builds a drag slider that is bound to the given value.
/// ///
/// Returns true if the slider value was changed. /// Returns true if the slider value was changed.
pub fn build(self, ui: &Ui<'_>, value: &mut T) -> bool { pub fn build(self, ui: &Ui, value: &mut T) -> bool {
unsafe { unsafe {
let (one, two) = ui.scratch_txt_with_opt(self.label, self.display_format); let (one, two) = ui.scratch_txt_with_opt(self.label, self.display_format);
@ -91,7 +91,7 @@ impl<L: AsRef<str>, T: DataTypeKind, F: AsRef<str>> Drag<T, L, F> {
/// Builds a horizontal array of multiple drag sliders attached to the given slice. /// Builds a horizontal array of multiple drag sliders attached to the given slice.
/// ///
/// Returns true if any slider value was changed. /// Returns true if any slider value was changed.
pub fn build_array(self, ui: &Ui<'_>, values: &mut [T]) -> bool { pub fn build_array(self, ui: &Ui, values: &mut [T]) -> bool {
unsafe { unsafe {
let (one, two) = ui.scratch_txt_with_opt(self.label, self.display_format); let (one, two) = ui.scratch_txt_with_opt(self.label, self.display_format);
@ -208,7 +208,7 @@ where
/// ///
/// Returns true if the slider value was changed. /// Returns true if the slider value was changed.
#[doc(alias = "DragFloatRange2")] #[doc(alias = "DragFloatRange2")]
pub fn build(self, ui: &Ui<'_>, min: &mut f32, max: &mut f32) -> bool { pub fn build(self, ui: &Ui, min: &mut f32, max: &mut f32) -> bool {
let label; let label;
let mut display_format = std::ptr::null(); let mut display_format = std::ptr::null();
let mut max_display_format = std::ptr::null(); let mut max_display_format = std::ptr::null();
@ -251,7 +251,7 @@ where
/// ///
/// Returns true if the slider value was changed. /// Returns true if the slider value was changed.
#[doc(alias = "DragIntRange2")] #[doc(alias = "DragIntRange2")]
pub fn build(self, ui: &Ui<'_>, min: &mut i32, max: &mut i32) -> bool { pub fn build(self, ui: &Ui, min: &mut i32, max: &mut i32) -> bool {
unsafe { unsafe {
let label; let label;
let mut display_format = std::ptr::null(); let mut display_format = std::ptr::null();

4
imgui/src/widget/image.rs
View File

@ -58,7 +58,7 @@ impl Image {
self self
} }
/// Builds the image /// Builds the image
pub fn build(self, _: &Ui<'_>) { pub fn build(self, _: &Ui) {
unsafe { unsafe {
sys::igImage( sys::igImage(
self.texture_id.id() as *mut c_void, self.texture_id.id() as *mut c_void,
@ -136,7 +136,7 @@ impl ImageButton {
self self
} }
/// Builds the image button /// Builds the image button
pub fn build(self, _: &Ui<'_>) -> bool { pub fn build(self, _: &Ui) -> bool {
unsafe { unsafe {
sys::igImageButton( sys::igImageButton(
self.texture_id.id() as *mut c_void, self.texture_id.id() as *mut c_void,

6
imgui/src/widget/list_box.rs
View File

@ -39,7 +39,7 @@ impl<T: AsRef<str>> ListBox<T> {
/// ///
/// Returns `None` if the list box is not open and no content should be rendered. /// Returns `None` if the list box is not open and no content should be rendered.
#[must_use] #[must_use]
pub fn begin<'ui>(self, ui: &Ui<'ui>) -> Option<ListBoxToken<'ui>> { pub fn begin(self, ui: &Ui) -> Option<ListBoxToken<'_>> {
let should_render = let should_render =
unsafe { sys::igBeginListBox(ui.scratch_txt(self.label), self.size.into()) }; unsafe { sys::igBeginListBox(ui.scratch_txt(self.label), self.size.into()) };
if should_render { if should_render {
@ -52,7 +52,7 @@ impl<T: AsRef<str>> ListBox<T> {
/// Returns the result of the closure, if it is called. /// Returns the result of the closure, if it is called.
/// ///
/// Note: the closure is not called if the list box is not open. /// Note: the closure is not called if the list box is not open.
pub fn build<R, F: FnOnce() -> R>(self, ui: &Ui<'_>, f: F) -> Option<R> { pub fn build<R, F: FnOnce() -> R>(self, ui: &Ui, f: F) -> Option<R> {
self.begin(ui).map(|_list| f()) self.begin(ui).map(|_list| f())
} }
} }
@ -71,7 +71,7 @@ impl<T: AsRef<str>> ListBox<T> {
/// Builds a simple list box for choosing from a slice of values /// Builds a simple list box for choosing from a slice of values
pub fn build_simple<V, L>( pub fn build_simple<V, L>(
self, self,
ui: &Ui<'_>, ui: &Ui,
current_item: &mut usize, current_item: &mut usize,
items: &[V], items: &[V],
label_fn: &L, label_fn: &L,

8
imgui/src/widget/menu.rs
View File

@ -3,7 +3,7 @@ use crate::sys;
use crate::Ui; use crate::Ui;
/// # Widgets: Menus /// # Widgets: Menus
impl<'ui> Ui<'ui> { impl Ui {
/// Creates and starts appending to a full-screen menu bar. /// Creates and starts appending to a full-screen menu bar.
/// ///
/// Returns `Some(MainMenuBarToken)` if the menu bar is visible. After content has been /// Returns `Some(MainMenuBarToken)` if the menu bar is visible. After content has been
@ -12,7 +12,7 @@ impl<'ui> Ui<'ui> {
/// Returns `None` if the menu bar is not visible and no content should be rendered. /// Returns `None` if the menu bar is not visible and no content should be rendered.
#[must_use] #[must_use]
#[doc(alias = "BeginMainMenuBar")] #[doc(alias = "BeginMainMenuBar")]
pub fn begin_main_menu_bar(&self) -> Option<MainMenuBarToken<'ui>> { pub fn begin_main_menu_bar(&self) -> Option<MainMenuBarToken<'_>> {
if unsafe { sys::igBeginMainMenuBar() } { if unsafe { sys::igBeginMainMenuBar() } {
Some(MainMenuBarToken::new(self)) Some(MainMenuBarToken::new(self))
} else { } else {
@ -167,7 +167,7 @@ impl<Label: AsRef<str>, Shortcut: AsRef<str>> MenuItem<Label, Shortcut> {
/// ///
/// Returns true if the menu item is activated. /// Returns true if the menu item is activated.
#[doc(alias = "MenuItemBool")] #[doc(alias = "MenuItemBool")]
pub fn build(self, ui: &Ui<'_>) -> bool { pub fn build(self, ui: &Ui) -> bool {
unsafe { unsafe {
let (label, shortcut) = ui.scratch_txt_with_opt(self.label, self.shortcut); let (label, shortcut) = ui.scratch_txt_with_opt(self.label, self.shortcut);
sys::igMenuItem_Bool(label, shortcut, self.selected, self.enabled) sys::igMenuItem_Bool(label, shortcut, self.selected, self.enabled)
@ -176,7 +176,7 @@ impl<Label: AsRef<str>, Shortcut: AsRef<str>> MenuItem<Label, Shortcut> {
#[doc(alias = "MenuItemBool")] #[doc(alias = "MenuItemBool")]
/// Builds the menu item using a mutable reference to selected state. /// Builds the menu item using a mutable reference to selected state.
pub fn build_with_ref(self, ui: &Ui<'_>, selected: &mut bool) -> bool { pub fn build_with_ref(self, ui: &Ui, selected: &mut bool) -> bool {
if self.selected(*selected).build(ui) { if self.selected(*selected).build(ui) {
*selected = !*selected; *selected = !*selected;
true true

2
imgui/src/widget/misc.rs
View File

@ -19,7 +19,7 @@ bitflags!(
); );
/// # Widgets: Miscellaneous /// # Widgets: Miscellaneous
impl<'ui> Ui<'ui> { impl Ui {
/// Renders a clickable button. /// Renders a clickable button.
/// ///
/// Returns true if this button was clicked. /// Returns true if this button was clicked.

2
imgui/src/widget/progress_bar.rs
View File

@ -62,7 +62,7 @@ impl<T: AsRef<str>> ProgressBar<T> {
} }
/// Builds the progress bar /// Builds the progress bar
pub fn build(self, ui: &Ui<'_>) { pub fn build(self, ui: &Ui) {
unsafe { unsafe {
sys::igProgressBar( sys::igProgressBar(
self.fraction, self.fraction,

4
imgui/src/widget/selectable.rs
View File

@ -108,7 +108,7 @@ impl<T: AsRef<str>> Selectable<T> {
/// Builds the selectable. /// Builds the selectable.
/// ///
/// Returns true if the selectable was clicked. /// Returns true if the selectable was clicked.
pub fn build(self, ui: &Ui<'_>) -> bool { pub fn build(self, ui: &Ui) -> bool {
unsafe { unsafe {
sys::igSelectable_Bool( sys::igSelectable_Bool(
ui.scratch_txt(self.label), ui.scratch_txt(self.label),
@ -120,7 +120,7 @@ impl<T: AsRef<str>> Selectable<T> {
} }
/// Builds the selectable using a mutable reference to selected state. /// Builds the selectable using a mutable reference to selected state.
pub fn build_with_ref(self, ui: &Ui<'_>, selected: &mut bool) -> bool { pub fn build_with_ref(self, ui: &Ui, selected: &mut bool) -> bool {
if self.selected(*selected).build(ui) { if self.selected(*selected).build(ui) {
*selected = !*selected; *selected = !*selected;
true true

8
imgui/src/widget/slider.rs
View File

@ -96,7 +96,7 @@ where
/// Builds a slider that is bound to the given value. /// Builds a slider that is bound to the given value.
/// ///
/// Returns true if the slider value was changed. /// Returns true if the slider value was changed.
pub fn build(self, ui: &Ui<'_>, value: &mut Data) -> bool { pub fn build(self, ui: &Ui, value: &mut Data) -> bool {
unsafe { unsafe {
let (label, display_format) = ui.scratch_txt_with_opt(self.label, self.display_format); let (label, display_format) = ui.scratch_txt_with_opt(self.label, self.display_format);
@ -114,7 +114,7 @@ where
/// Builds a horizontal array of multiple sliders attached to the given slice. /// Builds a horizontal array of multiple sliders attached to the given slice.
/// ///
/// Returns true if any slider value was changed. /// Returns true if any slider value was changed.
pub fn build_array(self, ui: &Ui<'_>, values: &mut [Data]) -> bool { pub fn build_array(self, ui: &Ui, values: &mut [Data]) -> bool {
unsafe { unsafe {
let (label, display_format) = ui.scratch_txt_with_opt(self.label, self.display_format); let (label, display_format) = ui.scratch_txt_with_opt(self.label, self.display_format);
@ -222,7 +222,7 @@ where
/// Builds a vertical slider that is bound to the given value. /// Builds a vertical slider that is bound to the given value.
/// ///
/// Returns true if the slider value was changed. /// Returns true if the slider value was changed.
pub fn build(self, ui: &Ui<'_>, value: &mut Data) -> bool { pub fn build(self, ui: &Ui, value: &mut Data) -> bool {
unsafe { unsafe {
let (label, display_format) = ui.scratch_txt_with_opt(self.label, self.display_format); let (label, display_format) = ui.scratch_txt_with_opt(self.label, self.display_format);
@ -326,7 +326,7 @@ where
/// Builds an angle slider that is bound to the given value (in radians). /// Builds an angle slider that is bound to the given value (in radians).
/// ///
/// Returns true if the slider value was changed. /// Returns true if the slider value was changed.
pub fn build(self, ui: &Ui<'_>, value_rad: &mut f32) -> bool { pub fn build(self, ui: &Ui, value_rad: &mut f32) -> bool {
unsafe { unsafe {
let (label, display_format) = ui.scratch_txt_two(self.label, self.display_format); let (label, display_format) = ui.scratch_txt_two(self.label, self.display_format);

10
imgui/src/widget/tab.rs
View File

@ -87,7 +87,7 @@ impl<T: AsRef<str>> TabBar<T> {
} }
#[must_use] #[must_use]
pub fn begin<'ui>(self, ui: &'ui Ui<'_>) -> Option<TabBarToken<'ui>> { pub fn begin(self, ui: &Ui) -> Option<TabBarToken<'_>> {
ui.tab_bar_with_flags(self.id, self.flags) ui.tab_bar_with_flags(self.id, self.flags)
} }
@ -95,7 +95,7 @@ impl<T: AsRef<str>> TabBar<T> {
/// Returns the result of the closure, if it is called. /// Returns the result of the closure, if it is called.
/// ///
/// Note: the closure is not called if no tabbar content is visible /// Note: the closure is not called if no tabbar content is visible
pub fn build<R, F: FnOnce() -> R>(self, ui: &Ui<'_>, f: F) -> Option<R> { pub fn build<R, F: FnOnce() -> R>(self, ui: &Ui, f: F) -> Option<R> {
self.begin(ui).map(|_tab| f()) self.begin(ui).map(|_tab| f())
} }
} }
@ -144,7 +144,7 @@ impl<'a, T: AsRef<str>> TabItem<'a, T> {
} }
#[must_use] #[must_use]
pub fn begin<'ui>(self, ui: &'ui Ui<'_>) -> Option<TabItemToken<'ui>> { pub fn begin(self, ui: &Ui) -> Option<TabItemToken<'_>> {
ui.tab_item_with_flags(self.label, self.opened, self.flags) ui.tab_item_with_flags(self.label, self.opened, self.flags)
} }
@ -152,7 +152,7 @@ impl<'a, T: AsRef<str>> TabItem<'a, T> {
/// Returns the result of the closure, if it is called. /// Returns the result of the closure, if it is called.
/// ///
/// Note: the closure is not called if the tab item is not selected /// Note: the closure is not called if the tab item is not selected
pub fn build<R, F: FnOnce() -> R>(self, ui: &Ui<'_>, f: F) -> Option<R> { pub fn build<R, F: FnOnce() -> R>(self, ui: &Ui, f: F) -> Option<R> {
self.begin(ui).map(|_tab| f()) self.begin(ui).map(|_tab| f())
} }
} }
@ -166,7 +166,7 @@ create_token!(
drop { sys::igEndTabItem() } drop { sys::igEndTabItem() }
); );
impl Ui<'_> { impl Ui {
/// Creates a tab bar and returns a tab bar token, allowing you to append /// Creates a tab bar and returns a tab bar token, allowing you to append
/// Tab items afterwards. This passes no flags. To pass flags explicitly, /// Tab items afterwards. This passes no flags. To pass flags explicitly,
/// use [tab_bar_with_flags](Self::tab_bar_with_flags). /// use [tab_bar_with_flags](Self::tab_bar_with_flags).

2
imgui/src/widget/text.rs
View File

@ -13,7 +13,7 @@ fn fmt_ptr() -> *const c_char {
} }
/// # Widgets: Text /// # Widgets: Text
impl<'ui> Ui<'ui> { impl Ui {
/// Renders simple text /// Renders simple text
#[doc(alias = "TextUnformatted")] #[doc(alias = "TextUnformatted")]
pub fn text<T: AsRef<str>>(&self, text: T) { pub fn text<T: AsRef<str>>(&self, text: T) {

18
imgui/src/widget/tree.rs
View File

@ -241,7 +241,7 @@ impl<T: AsRef<str>, L: AsRef<str>> TreeNode<T, L> {
/// rendered, the token can be popped by calling `.pop()`. /// rendered, the token can be popped by calling `.pop()`.
/// ///
/// Returns `None` if the tree node is not open and no content should be rendered. /// Returns `None` if the tree node is not open and no content should be rendered.
pub fn push<'ui>(self, ui: &Ui<'ui>) -> Option<TreeNodeToken<'ui>> { pub fn push(self, ui: &Ui) -> Option<TreeNodeToken<'_>> {
let open = unsafe { let open = unsafe {
if self.opened_cond != Condition::Never { if self.opened_cond != Condition::Never {
sys::igSetNextItemOpen(self.opened, self.opened_cond as i32); sys::igSetNextItemOpen(self.opened, self.opened_cond as i32);
@ -282,7 +282,7 @@ impl<T: AsRef<str>, L: AsRef<str>> TreeNode<T, L> {
/// Returns the result of the closure, if it is called. /// Returns the result of the closure, if it is called.
/// ///
/// Note: the closure is not called if the tree node is not open. /// Note: the closure is not called if the tree node is not open.
pub fn build<R, F: FnOnce() -> R>(self, ui: &Ui<'_>, f: F) -> Option<R> { pub fn build<R, F: FnOnce() -> R>(self, ui: &Ui, f: F) -> Option<R> {
self.push(ui).map(|_node| f()) self.push(ui).map(|_node| f())
} }
} }
@ -292,11 +292,11 @@ impl<T: AsRef<str>, L: AsRef<str>> TreeNode<T, L> {
/// If `TreeNodeFlags::NO_TREE_PUSH_ON_OPEN` was used when this token was created, calling `.pop()` /// If `TreeNodeFlags::NO_TREE_PUSH_ON_OPEN` was used when this token was created, calling `.pop()`
/// is not mandatory and is a no-op. /// is not mandatory and is a no-op.
#[must_use] #[must_use]
pub struct TreeNodeToken<'a>(core::marker::PhantomData<crate::Ui<'a>>, bool); pub struct TreeNodeToken<'a>(core::marker::PhantomData<&'a crate::Ui>, bool);
impl<'a> TreeNodeToken<'a> { impl<'a> TreeNodeToken<'a> {
/// Creates a new token type. This takes a bool for the no-op variant on NO_TREE_PUSH_ON_OPEN. /// Creates a new token type. This takes a bool for the no-op variant on NO_TREE_PUSH_ON_OPEN.
pub(crate) fn new(_: &crate::Ui<'a>, execute_drop: bool) -> Self { pub(crate) fn new(_: &crate::Ui, execute_drop: bool) -> Self {
Self(std::marker::PhantomData, execute_drop) Self(std::marker::PhantomData, execute_drop)
} }
@ -408,7 +408,7 @@ impl<T: AsRef<str>> CollapsingHeader<T> {
/// ///
/// This is the same as [build](Self::build) but is provided for consistent naming. /// This is the same as [build](Self::build) but is provided for consistent naming.
#[must_use] #[must_use]
pub fn begin(self, ui: &Ui<'_>) -> bool { pub fn begin(self, ui: &Ui) -> bool {
self.build(ui) self.build(ui)
} }
@ -419,7 +419,7 @@ impl<T: AsRef<str>> CollapsingHeader<T> {
/// This is the same as [build_with_close_button](Self::build_with_close_button) /// This is the same as [build_with_close_button](Self::build_with_close_button)
/// but is provided for consistent naming. /// but is provided for consistent naming.
#[must_use] #[must_use]
pub fn begin_with_close_button(self, ui: &Ui<'_>, opened: &mut bool) -> bool { pub fn begin_with_close_button(self, ui: &Ui, opened: &mut bool) -> bool {
self.build_with_close_button(ui, opened) self.build_with_close_button(ui, opened)
} }
@ -428,7 +428,7 @@ impl<T: AsRef<str>> CollapsingHeader<T> {
/// Returns true if the collapsing header is open and content should be rendered. /// Returns true if the collapsing header is open and content should be rendered.
#[must_use] #[must_use]
#[inline] #[inline]
pub fn build(self, ui: &Ui<'_>) -> bool { pub fn build(self, ui: &Ui) -> bool {
unsafe { unsafe {
sys::igCollapsingHeader_TreeNodeFlags( sys::igCollapsingHeader_TreeNodeFlags(
ui.scratch_txt(self.label), ui.scratch_txt(self.label),
@ -442,7 +442,7 @@ impl<T: AsRef<str>> CollapsingHeader<T> {
/// Returns true if the collapsing header is open and content should be rendered. /// Returns true if the collapsing header is open and content should be rendered.
#[must_use] #[must_use]
#[inline] #[inline]
pub fn build_with_close_button(self, ui: &Ui<'_>, opened: &mut bool) -> bool { pub fn build_with_close_button(self, ui: &Ui, opened: &mut bool) -> bool {
unsafe { unsafe {
sys::igCollapsingHeader_BoolPtr( sys::igCollapsingHeader_BoolPtr(
ui.scratch_txt(self.label), ui.scratch_txt(self.label),
@ -453,7 +453,7 @@ impl<T: AsRef<str>> CollapsingHeader<T> {
} }
} }
impl Ui<'_> { impl Ui {
/// Constructs a new collapsing header /// Constructs a new collapsing header
#[doc(alias = "CollapsingHeader")] #[doc(alias = "CollapsingHeader")]
pub fn collapsing_header(&self, label: impl AsRef<str>, flags: TreeNodeFlags) -> bool { pub fn collapsing_header(&self, label: impl AsRef<str>, flags: TreeNodeFlags) -> bool {

4
imgui/src/window/child_window.rs
View File

@ -9,7 +9,7 @@ use crate::Ui;
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
#[must_use] #[must_use]
pub struct ChildWindow<'ui, Label> { pub struct ChildWindow<'ui, Label> {
ui: &'ui Ui<'ui>, ui: &'ui Ui,
name: Label, name: Label,
flags: WindowFlags, flags: WindowFlags,
size: [f32; 2], size: [f32; 2],
@ -22,7 +22,7 @@ pub struct ChildWindow<'ui, Label> {
impl<'ui, Label: AsRef<str>> ChildWindow<'ui, Label> { impl<'ui, Label: AsRef<str>> ChildWindow<'ui, Label> {
/// Creates a new child window builder with the given ID /// Creates a new child window builder with the given ID
#[doc(alias = "BeginChildID")] #[doc(alias = "BeginChildID")]
pub fn new(ui: &'ui Ui<'ui>, name: Label) -> ChildWindow<'ui, Label> { pub fn new(ui: &'ui Ui, name: Label) -> ChildWindow<'ui, Label> {
ChildWindow { ChildWindow {
ui, ui,
name, name,

2
imgui/src/window/content_region.rs
View File

@ -2,7 +2,7 @@ use crate::sys;
use crate::Ui; use crate::Ui;
/// # Content region /// # Content region
impl<'ui> Ui<'ui> { impl Ui {
/// Returns the current content boundaries (in *window coordinates*) /// Returns the current content boundaries (in *window coordinates*)
#[doc(alias = "GetContentRegionMax")] #[doc(alias = "GetContentRegionMax")]
pub fn content_region_max(&self) -> [f32; 2] { pub fn content_region_max(&self) -> [f32; 2] {

6
imgui/src/window/mod.rs
View File

@ -111,7 +111,7 @@ bitflags! {
} }
/// # Window utilities /// # Window utilities
impl<'ui> Ui<'ui> { impl Ui {
/// Returns true if the current window appeared during this frame /// Returns true if the current window appeared during this frame
#[doc(alias = "IsWindowAppearing")] #[doc(alias = "IsWindowAppearing")]
pub fn is_window_appearing(&self) -> bool { pub fn is_window_appearing(&self) -> bool {
@ -162,7 +162,7 @@ impl<'ui> Ui<'ui> {
#[derive(Debug)] #[derive(Debug)]
#[must_use] #[must_use]
pub struct Window<'ui, 'a, Label> { pub struct Window<'ui, 'a, Label> {
ui: &'ui Ui<'ui>, ui: &'ui Ui,
name: Label, name: Label,
opened: Option<&'a mut bool>, opened: Option<&'a mut bool>,
flags: WindowFlags, flags: WindowFlags,
@ -181,7 +181,7 @@ pub struct Window<'ui, 'a, Label> {
impl<'ui, 'a, Label: AsRef<str>> Window<'ui, 'a, Label> { impl<'ui, 'a, Label: AsRef<str>> Window<'ui, 'a, Label> {
/// Typically created via [`Ui::window`] /// Typically created via [`Ui::window`]
pub fn new(ui: &'ui Ui<'ui>, name: Label) -> Self { pub fn new(ui: &'ui Ui, name: Label) -> Self {
Window { Window {
ui, ui,
name, name,

2
imgui/src/window/scroll.rs
View File

@ -2,7 +2,7 @@ use crate::sys;
use crate::Ui; use crate::Ui;
/// # Window scrolling /// # Window scrolling
impl<'ui> Ui<'ui> { impl Ui {
/// Returns the horizontal scrolling position. /// Returns the horizontal scrolling position.
/// ///
/// Value is between 0.0 and self.scroll_max_x(). /// Value is between 0.0 and self.scroll_max_x().