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

Remove some Nil suffixes

Browse Source 
Seems like these are present in the pre-generated bindings but not if calling the generator directly..? Have not looked into closely as to why
This commit is contained in:
dbr 2021-03-05 12:06:26 +11:00
parent 4f15805015
commit 0b5054e939
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
imgui/src/draw_list.rs
View File

@ -50,7 +50,7 @@ impl<'ui> DrawListMut<'ui> {
pub(crate) fn background(_: &Ui<'ui>) -> Self {
Self::lock_draw_list();
Self {
draw_list: unsafe { sys::igGetBackgroundDrawListNil() },
draw_list: unsafe { sys::igGetBackgroundDrawList() },
_phantom: PhantomData,
}
}
@ -58,7 +58,7 @@ impl<'ui> DrawListMut<'ui> {
pub(crate) fn foreground(_: &Ui<'ui>) -> Self {
Self::lock_draw_list();
Self {
draw_list: unsafe { sys::igGetForegroundDrawListNil() },
draw_list: unsafe { sys::igGetForegroundDrawList() },
_phantom: PhantomData,
}
}

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

@ -29,11 +29,11 @@ impl<'ui> Ui<'ui> {
}
/// Sets the horizontal scrolling position
pub fn set_scroll_x(&self, scroll_x: f32) {
unsafe { sys::igSetScrollXFloat(scroll_x) };
unsafe { sys::igSetScrollX(scroll_x) };
}
/// Sets the vertical scroll position
pub fn set_scroll_y(&self, scroll_y: f32) {
unsafe { sys::igSetScrollYFloat(scroll_y) };
unsafe { sys::igSetScrollY(scroll_y) };
}
/// Adjusts the horizontal scroll position to make the current cursor position visible
pub fn set_scroll_here_x(&self) {
@ -65,7 +65,7 @@ impl<'ui> Ui<'ui> {
}
/// Adjusts the horizontal scroll position to make the given position visible
pub fn set_scroll_from_pos_x(&self, local_x: f32) {
unsafe { sys::igSetScrollFromPosXFloat(local_x, 0.5) };
unsafe { sys::igSetScrollFromPosX(local_x, 0.5) };
}
/// Adjusts the horizontal scroll position to make the given position visible.
///
@ -75,11 +75,11 @@ impl<'ui> Ui<'ui> {
/// - `0.5`: center
/// - `1.0`: right
pub fn set_scroll_from_pos_x_with_ratio(&self, local_x: f32, center_x_ratio: f32) {
unsafe { sys::igSetScrollFromPosXFloat(local_x, center_x_ratio) };
unsafe { sys::igSetScrollFromPosX(local_x, center_x_ratio) };
}
/// Adjusts the vertical scroll position to make the given position visible
pub fn set_scroll_from_pos_y(&self, local_y: f32) {
unsafe { sys::igSetScrollFromPosYFloat(local_y, 0.5) };
unsafe { sys::igSetScrollFromPosY(local_y, 0.5) };
}
/// Adjusts the vertical scroll position to make the given position visible.
///
@ -89,6 +89,6 @@ impl<'ui> Ui<'ui> {
/// - `0.5`: center
/// - `1.0`: bottom
pub fn set_scroll_from_pos_y_with_ratio(&self, local_y: f32, center_y_ratio: f32) {
unsafe { sys::igSetScrollFromPosYFloat(local_y, center_y_ratio) };
unsafe { sys::igSetScrollFromPosY(local_y, center_y_ratio) };
}
}