typed handles for TabControl widget + fixes

Author: mrDIMAS

editor/src/plugins/tilemap/tileset.rs

@@ -88,7 +88,7 @@ pub struct TileSetEditor {
     cell_position: Handle<Text>,
     /// The control that allows the editor to switch between the tiles tab,
     /// the properties tab, and the colliders tabl.
-    tab_control: Handle<UiNode>,
+    tab_control: Handle<TabControl>,
     /// The palette widget for the page icons. It is used to select which page to edit.
     pages_palette: Handle<UiNode>,
     /// The palette widget for the actual tiles. This is the main work area of the editor.
@@ -522,7 +522,7 @@ impl TileSetEditor {
     }
 
     fn send_tabs_visible(&self, is_tile_set: bool, ui: &mut UserInterface) {
-        let tab_control = ui.node(self.tab_control).cast::<TabControl>().unwrap();
+        let tab_control = &ui[self.tab_control];
         let tabs = tab_control.headers_container;
         let children = ui[tabs].children();
         for &tab in &children[1..3] {

editor/src/scene_viewer/mod.rs

@@ -277,7 +277,7 @@ pub struct SceneViewer {
     interaction_mode_panel: Handle<UiNode>,
     contextual_actions: Handle<UiNode>,
     no_scene_reminder: Handle<Text>,
-    tab_control: Handle<UiNode>,
+    tab_control: Handle<TabControl>,
     scene_gizmo: SceneGizmo,
     scene_gizmo_image: Handle<Image>,
     debug_switches: Handle<UiNode>,
@@ -885,12 +885,7 @@ impl SceneViewer {
     pub fn sync_to_model(&self, scenes: &SceneContainer, engine: &mut Engine) {
         // Sync tabs first.
 
-        let tabs = engine
-            .user_interfaces
-            .first_mut()
-            .node(self.tab_control)
-            .query_component::<TabControl>()
-            .expect("Must be TabControl!")
+        let tabs = engine.user_interfaces.first_mut()[self.tab_control]
             .tabs
             .clone();
         // Remove any excess tabs.

fyrox-ui/src/dock/tile.rs

@@ -271,7 +271,7 @@ pub struct Tile {
     pub top_anchor: Handle<Border>,
     pub bottom_anchor: Handle<Border>,
     pub center_anchor: Handle<Border>,
-    pub tabs: Handle<UiNode>,
+    pub tabs: Handle<TabControl>,
     pub content: TileContent,
     pub splitter: Handle<Border>,
     pub dragging_splitter: bool,
@@ -304,7 +304,7 @@ impl Control for Tile {
             return self.measure_vertical_with_minimized(ui, available_size);
         }
         ui.measure_node(self.tabs, Vector2::new(available_size.x, f32::INFINITY));
-        available_size.y -= ui.node(self.tabs).desired_size().y;
+        available_size.y -= ui[self.tabs].desired_size().y;
         for &child_handle in self.children() {
             if child_handle == self.tabs {
                 continue;
@@ -347,7 +347,7 @@ impl Control for Tile {
             TileContent::Empty => Vector2::default(),
             TileContent::Window(handle) => ui[*handle].desired_size(),
             TileContent::MultiWindow { index, windows } => {
-                let tabs = ui.node(self.tabs).desired_size();
+                let tabs = ui[self.tabs].desired_size();
                 let body = windows
                     .get(*index as usize)
                     .map(|w| ui[*w].desired_size())
@@ -387,7 +387,7 @@ impl Control for Tile {
             return self.arrange_vertical_with_minimized(ui, final_size);
         }
 
-        let tabs_height = ui.node(self.tabs).desired_size().y;
+        let tabs_height = ui[self.tabs].desired_size().y;
         ui.arrange_node(self.tabs, &Rect::new(0.0, 0.0, final_size.x, tabs_height));
         let full_bounds = Rect::new(0.0, tabs_height, final_size.x, final_size.y - tabs_height);
         for &child_handle in self.children() {
@@ -494,7 +494,7 @@ impl Control for Tile {
                             }
                             TileContent::MultiWindow { index, windows } => {
                                 send_visibility(ui, self.splitter, false);
-                                let tabs = ui.node(self.tabs).cast::<TabControl>().unwrap();
+                                let tabs = &ui[self.tabs];
                                 for tab in tabs.tabs.iter() {
                                     let uuid = tab.uuid;
                                     if !windows.iter().any(|&h| ui[h].id == uuid) {
@@ -507,7 +507,7 @@ impl Control for Tile {
                                 for (i, &w) in windows.iter().enumerate() {
                                     let is_active = i as u32 == *index;
                                     let uuid = ui[w].id;
-                                    let tabs = ui.node(self.tabs).cast::<TabControl>().unwrap();
+                                    let tabs = &ui[self.tabs];
                                     if tabs.get_tab_by_uuid(uuid).is_none() {
                                         self.add_tab(w, ui);
                                     }

fyrox-ui/src/tab_control.rs

@@ -257,6 +257,7 @@ impl ConstructorProvider<UiNode, UserInterface> for TabControl {
             .with_variant("Tab Control", |ui| {
                 TabControlBuilder::new(WidgetBuilder::new().with_name("Tab Control"))
                     .build(&mut ui.build_ctx())
+                    .to_base()
                     .into()
             })
             .with_group("Layout")
@@ -657,7 +658,7 @@ impl TabControlBuilder {
     }
 
     /// Finishes [`TabControl`] building and adds it to the user interface and returns its handle.
-    pub fn build(self, ctx: &mut BuildContext) -> Handle<UiNode> {
+    pub fn build(self, ctx: &mut BuildContext) -> Handle<TabControl> {
         let tab_count = self.tabs.len();
         // Hide everything but initial tab content.
         for (i, (_, tab)) in self.tabs.iter().enumerate() {
@@ -745,7 +746,7 @@ impl TabControlBuilder {
             active_tab_brush: active_tab_brush.into(),
         };
 
-        ctx.add_node(UiNode::new(tc))
+        ctx.add_node(UiNode::new(tc)).to_variant()
     }
 }
 

fyrox-ui/src/thumb.rs

@@ -48,18 +48,19 @@ impl MessageData for ThumbMessage {}
 /// splitter in a docking manager's tile, etc.
 ///
 /// ```rust
-/// use fyrox_ui::{
-///     border::BorderBuilder,
-///     brush::Brush,
-///     core::{color::Color, pool::Handle},
-///     decorator::DecoratorBuilder,
-///     message::{CursorIcon, MessageDirection, UiMessage},
-///     thumb::{ThumbBuilder, ThumbMessage},
-///     widget::WidgetBuilder,
-///     BuildContext, UiNode,
-/// };
-///
-/// fn create_thumb(ctx: &mut BuildContext) -> Handle<UiNode> {
+/// # use fyrox_ui::{
+/// #     border::BorderBuilder,
+/// #     brush::Brush,
+/// #     core::{color::Color, pool::Handle},
+/// #     decorator::DecoratorBuilder,
+/// #     message::{CursorIcon, MessageDirection, UiMessage},
+/// #     thumb::{ThumbBuilder, ThumbMessage},
+/// #     widget::WidgetBuilder,
+/// #     BuildContext, UiNode,
+/// # };
+/// # use fyrox_ui::thumb::Thumb;
+/// #
+/// fn create_thumb(ctx: &mut BuildContext) -> Handle<Thumb> {
 ///     ThumbBuilder::new(
 ///         WidgetBuilder::new().with_child(
 ///             DecoratorBuilder::new(BorderBuilder::new(
@@ -79,22 +80,19 @@ impl MessageData for ThumbMessage {}
 /// }
 ///
 /// fn process_thumb_messages(my_thumb: Handle<UiNode>, message: &UiMessage) {
-///     if message.destination() == my_thumb && message.direction() == MessageDirection::FromWidget
-///     {
-///         if let Some(msg) = message.data::<ThumbMessage>() {
-///             match msg {
-///                 ThumbMessage::DragStarted { position } => {
-///                     // Sent by a thumb when it just started dragging. The provided position
-///                     // expressed in local coordinates of the thumb.
-///                 }
-///                 ThumbMessage::DragDelta { offset } => {
-///                     // Sent by a thumb when it is being dragged. The provided offset
-///                     // expressed in local coordinates of the thumb.
-///                 }
-///                 ThumbMessage::DragCompleted { position } => {
-///                     // Sent by a thumb when it just stopped dragging. The provided position
-///                     // expressed in local coordinates of the thumb.
-///                 }
+///     if let Some(msg) = message.data_from::<ThumbMessage>(my_thumb) {
+///         match msg {
+///             ThumbMessage::DragStarted { position } => {
+///                 // Sent by a thumb when it just started dragging. The provided position
+///                 // expressed in local coordinates of the thumb.
+///             }
+///             ThumbMessage::DragDelta { offset } => {
+///                 // Sent by a thumb when it is being dragged. The provided offset
+///                 // expressed in local coordinates of the thumb.
+///             }
+///             ThumbMessage::DragCompleted { position } => {
+///                 // Sent by a thumb when it just stopped dragging. The provided position
+///                 // expressed in local coordinates of the thumb.
 ///             }
 ///         }
 ///     }