diff --git a/editor/src/plugins/inspector/editors/mod.rs b/editor/src/plugins/inspector/editors/mod.rs index 7cecdad55..e69ada4b2 100644 --- a/editor/src/plugins/inspector/editors/mod.rs +++ b/editor/src/plugins/inspector/editors/mod.rs @@ -199,6 +199,8 @@ use crate::{ selection::SelectionSettings, }, }; +use fyrox::gui::message::{ButtonState, KeyboardModifiers}; +use fyrox::gui::{MouseState, RenderMode, RestrictionEntry}; use fyrox::scene::graph::physics::character::{ CharacterAutostep, CharacterLength, KinematicCharacterController, }; @@ -650,6 +652,17 @@ pub fn make_property_editors_container( container.insert(EnumPropertyEditorDefinition::::new()); container.insert(EnumPropertyEditorDefinition::::new_optional()); + container.insert(EnumPropertyEditorDefinition::::new()); + container.insert(EnumPropertyEditorDefinition::::new_optional()); + + container.insert(EnumPropertyEditorDefinition::::new()); + + container.insert(InspectablePropertyEditorDefinition::::new()); + container.insert(VecCollectionPropertyEditorDefinition::::new()); + + container.insert(InspectablePropertyEditorDefinition::::new()); + container.insert(InspectablePropertyEditorDefinition::::new()); + container.insert(ShaderSourceCodeEditorDefinition); container.insert(EnumPropertyEditorDefinition::::new()); diff --git a/fyrox-ui/src/lib.rs b/fyrox-ui/src/lib.rs index 96ec6012c..19bf95d00 100644 --- a/fyrox-ui/src/lib.rs +++ b/fyrox-ui/src/lib.rs @@ -693,7 +693,7 @@ pub struct UiUpdateSwitches { pub type WidgetPool = Pool; -#[derive(Default, Debug, Clone, PartialEq, Reflect, Visit)] +#[derive(Default, Debug, Clone, PartialEq, Reflect, Visit, AsRefStr, EnumString, VariantNames)] #[reflect(type_uuid = "b426e937-4050-4539-8041-ade4222539c8")] pub enum RenderMode { /// The UI will be re-rendered on every frame. This is the default behavior. @@ -745,10 +745,12 @@ pub struct UserInterface { pub style: StyleResource, #[reflect(hidden)] ui_message_channel: UiMessageChannel, + #[reflect(hidden)] stack: Vec>, picking_stack: Vec, #[reflect(hidden)] bubble_queue: VecDeque>, + #[reflect(hidden)] drag_context: DragContext, mouse_state: MouseState, keyboard_modifiers: KeyboardModifiers, diff --git a/fyrox-ui/src/message.rs b/fyrox-ui/src/message.rs index be09291c3..39aff3222 100644 --- a/fyrox-ui/src/message.rs +++ b/fyrox-ui/src/message.rs @@ -521,7 +521,21 @@ impl UiMessage { } /// Mouse button state. -#[derive(Debug, Hash, Ord, PartialOrd, PartialEq, Eq, Clone, Copy, Visit, Reflect)] +#[derive( + Debug, + Hash, + Ord, + PartialOrd, + PartialEq, + Eq, + Clone, + Copy, + Visit, + Reflect, + AsRefStr, + EnumString, + VariantNames, +)] #[reflect(type_uuid = "520d4eae-6772-4037-bff2-23a591a761ee")] pub enum ButtonState { /// Pressed state.