From 76f2089b06d9efd134ff8019b99998c88f24071d Mon Sep 17 00:00:00 2001 From: Joonas Javanainen Date: Sat, 4 Nov 2017 11:17:13 +0200 Subject: [PATCH] Reformat --- src/child_frame.rs | 5 ++-- src/lib.rs | 57 +++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 34 deletions(-) diff --git a/src/child_frame.rs b/src/child_frame.rs index d53b1c2..b14f03a 100644 --- a/src/child_frame.rs +++ b/src/child_frame.rs @@ -107,9 +107,8 @@ impl<'ui, 'p> ChildFrame<'ui, 'p> { // https://github.com/Gekkio/imgui-rs/pull/58 let show_border = false; - let render_child_frame = unsafe { - sys::igBeginChild(self.name.as_ptr(), self.size, show_border, self.flags) - }; + let render_child_frame = + unsafe { sys::igBeginChild(self.name.as_ptr(), self.size, show_border, self.flags) }; if render_child_frame { f(); } diff --git a/src/lib.rs b/src/lib.rs index 2aaeb25..32a5560 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -10,36 +10,33 @@ use sys::ImGuiStyleVar; #[allow(deprecated)] pub use sys::{ImGuiInputTextFlags_AllowTabInput, ImGuiInputTextFlags_AlwaysInsertMode, - ImGuiInputTextFlags_AutoSelectAll, ImGuiInputTextFlags_CallbackAlways, - ImGuiInputTextFlags_CallbackCharFilter, - ImGuiInputTextFlags_CallbackCompletion, ImGuiInputTextFlags_CallbackHistory, - ImGuiInputTextFlags_CharsDecimal, ImGuiInputTextFlags_CharsHexadecimal, - ImGuiInputTextFlags_CharsNoBlank, ImGuiInputTextFlags_CharsUppercase, - ImGuiInputTextFlags_CtrlEnterForNewLine, ImGuiInputTextFlags_EnterReturnsTrue, - ImGuiInputTextFlags_NoHorizontalScroll, ImGuiInputTextFlags_Password, - ImGuiInputTextFlags_ReadOnly, ImGuiSelectableFlags_DontClosePopups, - ImGuiSelectableFlags_SpanAllColumns, ImGuiSetCond_Always, - ImGuiSetCond_Appearing, ImGuiSetCond_FirstUseEver, ImGuiSetCond_Once, - ImGuiTreeNodeFlags_AllowOverlapMode, ImGuiTreeNodeFlags_Bullet, - ImGuiTreeNodeFlags_CollapsingHeader, ImGuiTreeNodeFlags_DefaultOpen, - ImGuiTreeNodeFlags_Framed, ImGuiTreeNodeFlags_Leaf, - ImGuiTreeNodeFlags_NoAutoOpenOnLog, ImGuiTreeNodeFlags_NoTreePushOnOpen, - ImGuiTreeNodeFlags_OpenOnArrow, ImGuiTreeNodeFlags_OpenOnDoubleClick, - ImGuiTreeNodeFlags_Selected, ImGuiWindowFlags_AlwaysAutoResize, - ImGuiWindowFlags_AlwaysHorizontalScrollbar, - ImGuiWindowFlags_AlwaysUseWindowPadding, - ImGuiWindowFlags_AlwaysVerticalScrollbar, - ImGuiWindowFlags_HorizontalScrollbar, ImGuiWindowFlags_MenuBar, - ImGuiWindowFlags_NoBringToFrontOnFocus, ImGuiWindowFlags_NoCollapse, - ImGuiWindowFlags_NoFocusOnAppearing, ImGuiWindowFlags_NoInputs, - ImGuiWindowFlags_NoMove, ImGuiWindowFlags_NoResize, - ImGuiWindowFlags_NoSavedSettings, ImGuiWindowFlags_NoScrollWithMouse, - ImGuiWindowFlags_NoScrollbar, ImGuiWindowFlags_NoTitleBar, - ImGuiWindowFlags_ShowBorders}; + ImGuiInputTextFlags_AutoSelectAll, ImGuiInputTextFlags_CallbackAlways, + ImGuiInputTextFlags_CallbackCharFilter, ImGuiInputTextFlags_CallbackCompletion, + ImGuiInputTextFlags_CallbackHistory, ImGuiInputTextFlags_CharsDecimal, + ImGuiInputTextFlags_CharsHexadecimal, ImGuiInputTextFlags_CharsNoBlank, + ImGuiInputTextFlags_CharsUppercase, ImGuiInputTextFlags_CtrlEnterForNewLine, + ImGuiInputTextFlags_EnterReturnsTrue, ImGuiInputTextFlags_NoHorizontalScroll, + ImGuiInputTextFlags_Password, ImGuiInputTextFlags_ReadOnly, + ImGuiSelectableFlags_DontClosePopups, ImGuiSelectableFlags_SpanAllColumns, + ImGuiSetCond_Always, ImGuiSetCond_Appearing, ImGuiSetCond_FirstUseEver, + ImGuiSetCond_Once, ImGuiTreeNodeFlags_AllowOverlapMode, ImGuiTreeNodeFlags_Bullet, + ImGuiTreeNodeFlags_CollapsingHeader, ImGuiTreeNodeFlags_DefaultOpen, + ImGuiTreeNodeFlags_Framed, ImGuiTreeNodeFlags_Leaf, + ImGuiTreeNodeFlags_NoAutoOpenOnLog, ImGuiTreeNodeFlags_NoTreePushOnOpen, + ImGuiTreeNodeFlags_OpenOnArrow, ImGuiTreeNodeFlags_OpenOnDoubleClick, + ImGuiTreeNodeFlags_Selected, ImGuiWindowFlags_AlwaysAutoResize, + ImGuiWindowFlags_AlwaysHorizontalScrollbar, ImGuiWindowFlags_AlwaysUseWindowPadding, + ImGuiWindowFlags_AlwaysVerticalScrollbar, ImGuiWindowFlags_HorizontalScrollbar, + ImGuiWindowFlags_MenuBar, ImGuiWindowFlags_NoBringToFrontOnFocus, + ImGuiWindowFlags_NoCollapse, ImGuiWindowFlags_NoFocusOnAppearing, + ImGuiWindowFlags_NoInputs, ImGuiWindowFlags_NoMove, ImGuiWindowFlags_NoResize, + ImGuiWindowFlags_NoSavedSettings, ImGuiWindowFlags_NoScrollWithMouse, + ImGuiWindowFlags_NoScrollbar, ImGuiWindowFlags_NoTitleBar, + ImGuiWindowFlags_ShowBorders}; pub use sys::{ImDrawIdx, ImDrawVert, ImGuiColorEditFlags, ImGuiInputTextFlags, ImGuiKey, - ImGuiSelectableFlags, ImGuiCond, ImGuiCol, ImGuiStyle, ImGuiTreeNodeFlags, - ImGuiWindowFlags, ImVec2, ImVec4}; + ImGuiSelectableFlags, ImGuiCond, ImGuiCol, ImGuiStyle, ImGuiTreeNodeFlags, + ImGuiWindowFlags, ImVec2, ImVec4}; pub use child_frame::ChildFrame; pub use color_editors::{ColorEdit, ColorEditMode, ColorPicker, ColorPickerMode, EditableColor, EditableColorFormat, EditableColorPreview}; @@ -364,9 +361,7 @@ impl<'ui> Ui<'ui> { Ok(()) } pub fn show_user_guide(&self) { unsafe { sys::igShowUserGuide() }; } - pub fn show_default_style_editor(&self) { - unsafe { sys::igShowStyleEditor(ptr::null_mut()) }; - } + pub fn show_default_style_editor(&self) { unsafe { sys::igShowStyleEditor(ptr::null_mut()) }; } pub fn show_style_editor<'p>(&self, style: &'p mut ImGuiStyle) { unsafe { sys::igShowStyleEditor(style as *mut ImGuiStyle);