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

Overhaul ImStr constructors

Browse Source
This commit is contained in:
Joonas Javanainen 2015-08-26 12:43:08 +01:00
parent 1811248fb6
commit e875305b29
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib.rs
View File

@ -11,6 +11,7 @@ extern crate sdl2;
use libc::{c_char, c_float, c_int, c_uchar}; use libc::{c_char, c_float, c_int, c_uchar};
use std::borrow::Cow; use std::borrow::Cow;
use std::convert::From;
use std::ffi::CStr; use std::ffi::CStr;
use std::fmt; use std::fmt;
use std::mem; use std::mem;
@ -52,10 +53,10 @@ pub struct ImGui;
macro_rules! im_str { macro_rules! im_str {
($e:tt) => ({ ($e:tt) => ({
let value = concat!($e, "\0"); let value = concat!($e, "\0");
unsafe { ::imgui::ImStr::from_bytes(value.as_bytes()) } unsafe { ::imgui::ImStr::from_bytes_unchecked(value.as_bytes()) }
}); });
($e:tt, $($arg:tt)*) => ({ ($e:tt, $($arg:tt)*) => ({
::imgui::ImStr::from_fmt(format_args!($e, $($arg)*)) ::imgui::ImStr::from(format!($e, $($arg)*))
}) })
} }
@ -65,26 +66,31 @@ pub struct ImStr<'a> {
} }
impl<'a> ImStr<'a> { impl<'a> ImStr<'a> {
pub unsafe fn from_bytes(bytes: &'a [u8]) -> ImStr<'a> { pub unsafe fn from_bytes_unchecked(bytes: &'a [u8]) -> ImStr<'a> {
ImStr { ImStr {
bytes: Cow::Borrowed(bytes) bytes: Cow::Borrowed(bytes)
} }
} }
pub fn from_str(value: &str) -> ImStr<'a> { fn as_ptr(&self) -> *const c_char { self.bytes.as_ptr() as *const c_char }
}
impl<'a> From<&'a str> for ImStr<'a> {
fn from(value: &'a str) -> ImStr<'a> {
let mut bytes: Vec<u8> = value.bytes().collect(); let mut bytes: Vec<u8> = value.bytes().collect();
bytes.push(0); bytes.push(0);
ImStr { ImStr {
bytes: Cow::Owned(bytes) bytes: Cow::Owned(bytes)
} }
} }
pub fn from_fmt(args: fmt::Arguments) -> ImStr<'a> { }
let mut bytes = fmt::format(args).into_bytes();
bytes.push(0); impl From<String> for ImStr<'static> {
fn from(mut value: String) -> ImStr<'static> {
value.push('\0');
ImStr { ImStr {
bytes: Cow::Owned(bytes) bytes: Cow::Owned(value.into_bytes())
} }
} }
fn as_ptr(&self) -> *const c_char { self.bytes.as_ptr() as *const c_char }
} }
pub struct TextureHandle<'a> { pub struct TextureHandle<'a> {

4
src/sliders.rs
View File

@ -22,7 +22,7 @@ impl<'ui, 'p> SliderInt<'ui, 'p> {
value: value, value: value,
min: min, min: min,
max: max, max: max,
display_format: unsafe { ImStr::from_bytes(b"%.0f\0") }, display_format: unsafe { ImStr::from_bytes_unchecked(b"%.0f\0") },
_phantom: PhantomData _phantom: PhantomData
} }
} }
@ -60,7 +60,7 @@ impl<'ui, 'p> SliderFloat<'ui, 'p> {
value: value, value: value,
min: min, min: min,
max: max, max: max,
display_format: unsafe { ImStr::from_bytes(b"%.3f\0") }, display_format: unsafe { ImStr::from_bytes_unchecked(b"%.3f\0") },
power: 1.0, power: 1.0,
_phantom: PhantomData _phantom: PhantomData
} }

2
src/window.rs
View File

@ -33,7 +33,7 @@ impl<'ui, 'p> Window<'ui, 'p> {
pos_cond: ImGuiSetCond::empty(), pos_cond: ImGuiSetCond::empty(),
size: (0.0, 0.0), size: (0.0, 0.0),
size_cond: ImGuiSetCond::empty(), size_cond: ImGuiSetCond::empty(),
name: unsafe { ImStr::from_bytes(b"Debug\0") }, name: unsafe { ImStr::from_bytes_unchecked(b"Debug\0") },
opened: None, opened: None,
bg_alpha: -1.0, bg_alpha: -1.0,
flags: ImGuiWindowFlags::empty(), flags: ImGuiWindowFlags::empty(),