mirror of
https://github.com/FyroxEngine/Fyrox.git
synced 2026-10-11 22:50:08 +00:00
added missing property editors for ui
This commit is contained in:
@@ -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::<BlendFactor>::new());
|
||||
container.insert(EnumPropertyEditorDefinition::<BlendFactor>::new_optional());
|
||||
|
||||
container.insert(EnumPropertyEditorDefinition::<RenderMode>::new());
|
||||
container.insert(EnumPropertyEditorDefinition::<RenderMode>::new_optional());
|
||||
|
||||
container.insert(EnumPropertyEditorDefinition::<ButtonState>::new());
|
||||
|
||||
container.insert(InspectablePropertyEditorDefinition::<RestrictionEntry>::new());
|
||||
container.insert(VecCollectionPropertyEditorDefinition::<RestrictionEntry>::new());
|
||||
|
||||
container.insert(InspectablePropertyEditorDefinition::<KeyboardModifiers>::new());
|
||||
container.insert(InspectablePropertyEditorDefinition::<MouseState>::new());
|
||||
|
||||
container.insert(ShaderSourceCodeEditorDefinition);
|
||||
|
||||
container.insert(EnumPropertyEditorDefinition::<TextureKind>::new());
|
||||
|
||||
+3
-1
@@ -693,7 +693,7 @@ pub struct UiUpdateSwitches {
|
||||
|
||||
pub type WidgetPool = Pool<UiNode, WidgetContainer>;
|
||||
|
||||
#[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<Handle<UiNode>>,
|
||||
picking_stack: Vec<RestrictionEntry>,
|
||||
#[reflect(hidden)]
|
||||
bubble_queue: VecDeque<Handle<UiNode>>,
|
||||
#[reflect(hidden)]
|
||||
drag_context: DragContext,
|
||||
mouse_state: MouseState,
|
||||
keyboard_modifiers: KeyboardModifiers,
|
||||
|
||||
+15
-1
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user