Merge branch 'texture_region'

FyroxEngine · Jan 28, 2025 · 38d81ca · 38d81ca
2 parents ba145b4 + 7ebba91
commit 38d81ca
Show file tree

Hide file tree

Showing 5 changed files with 1,030 additions and 36 deletions.
diff --git a/fyrox-ui/src/inspector/editors/mod.rs b/fyrox-ui/src/inspector/editors/mod.rs
@@ -21,7 +21,7 @@
 //! A collection of [PropertyEditorDefinition] objects for a wide variety of types,
 //! including standard Rust types and Fyrox core types.
 
-use crate::nine_patch::StretchMode;
+use crate::inspector::editors::texture_slice::TextureSlicePropertyEditorDefinition;
 use crate::{
     absm::{EventAction, EventKind},
     bit::BitField,
@@ -82,7 +82,7 @@ use crate::{
     menu::{Menu, MenuItem},
     message::{CursorIcon, UiMessage},
     messagebox::MessageBox,
-    nine_patch::NinePatch,
+    nine_patch::{NinePatch, StretchMode},
     numeric::NumericUpDown,
     path::PathEditor,
     popup::Popup,
@@ -141,6 +141,7 @@ pub mod rect;
 pub mod refcell;
 pub mod string;
 mod style;
+pub mod texture_slice;
 pub mod utf32;
 pub mod uuid;
 pub mod vec;
@@ -586,6 +587,8 @@ impl PropertyEditorDefinitionContainer {
             Arc<Mutex<RcUiNodeHandleInner>>,
         >::new());
 
+        container.insert(TextureSlicePropertyEditorDefinition);
+
         // Styled.
         container.insert(InheritablePropertyEditorDefinition::<StyledProperty<f32>>::new());
         container.insert(StyledPropertyEditorDefinition::<f32>::new());