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

Merge pull request #222 from AlexEne/master

Browse Source 
Allow &[&ImString]  as well as &[&ImStr] in combo and list_box
This commit is contained in:
Joonas Javanainen 2019-06-03 21:07:48 +03:00 committed by GitHub
commit 762cf22c32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib.rs
View File

@ -1256,14 +1256,14 @@ impl<'ui> Ui<'ui> {
// Widgets: Combos // Widgets: Combos
impl<'ui> Ui<'ui> { impl<'ui> Ui<'ui> {
pub fn combo<'p>( pub fn combo<'p, StringType: AsRef<ImStr> + ?Sized>(
&self, &self,
label: &'p ImStr, label: &'p ImStr,
current_item: &mut i32, current_item: &mut i32,
items: &'p [&'p ImStr], items: &'p [&'p StringType],
height_in_items: i32, height_in_items: i32,
) -> bool { ) -> bool {
let items_inner: Vec<*const c_char> = items.into_iter().map(|item| item.as_ptr()).collect(); let items_inner: Vec<*const c_char> = items.into_iter().map(|item| item.as_ref().as_ptr()).collect();
unsafe { unsafe {
sys::igCombo( sys::igCombo(
label.as_ptr(), label.as_ptr(),
@ -1278,14 +1278,14 @@ impl<'ui> Ui<'ui> {
// Widgets: ListBox // Widgets: ListBox
impl<'ui> Ui<'ui> { impl<'ui> Ui<'ui> {
pub fn list_box<'p>( pub fn list_box<'p, StringType: AsRef<ImStr> + ?Sized>(
&self, &self,
label: &'p ImStr, label: &'p ImStr,
current_item: &mut i32, current_item: &mut i32,
items: &'p [&'p ImStr], items: &'p [&'p StringType],
height_in_items: i32, height_in_items: i32,
) -> bool { ) -> bool {
let items_inner: Vec<*const c_char> = items.into_iter().map(|item| item.as_ptr()).collect(); let items_inner: Vec<*const c_char> = items.into_iter().map(|item| item.as_ref().as_ptr()).collect();
unsafe { unsafe {
sys::igListBoxStr_arr( sys::igListBoxStr_arr(
label.as_ptr(), label.as_ptr(),