Skip to content

Commit f45ff88

Browse files
committed
refactoring inspector
1 parent b044643 commit f45ff88

18 files changed

Lines changed: 735 additions & 369 deletions

File tree

crates/bevy_animation_graph/src/core/animation_node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use bevy::{
1515
use std::{any::TypeId, fmt::Debug};
1616

1717
#[reflect_trait]
18-
pub trait NodeLike: NodeLikeClone + Send + Sync + Debug + Reflect {
18+
pub trait NodeLike: NodeLikeClone + Send + Sync + Debug + Reflect + 'static {
1919
fn duration(&self, _ctx: PassContext) -> Result<(), GraphError> {
2020
Ok(())
2121
}

crates/bevy_animation_graph_editor/src/ui/actions/mod.rs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ use window::WindowAction;
3131

3232
use crate::ui::native_views::EditorViewUiState;
3333

34-
use super::{
35-
UiState,
36-
core::{EditorViewVariant, ViewAction},
37-
windows::WindowId,
38-
};
34+
use super::{UiState, core::ViewAction, windows::WindowId};
3935

4036
#[derive(Resource, Default)]
4137
pub struct PendingActions {
@@ -107,12 +103,8 @@ fn handle_view_action(
107103
) {
108104
match view_action {
109105
ViewAction::Close(index) => {
110-
match ui_state.views.remove(index) {
111-
EditorViewVariant::Legacy(_) => {}
112-
EditorViewVariant::Native(view_state) => {
113-
commands.entity(view_state.entity).despawn();
114-
}
115-
}
106+
let view_state = ui_state.views.remove(index);
107+
commands.entity(view_state.entity).despawn();
116108

117109
if let Some(idx) = ui_state.active_view {
118110
match idx.cmp(&index) {

crates/bevy_animation_graph_editor/src/ui/actions/saving.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::{
22
Cli,
33
ui::{
44
UiState,
5-
core::{EditorViewVariant, EguiWindow},
5+
core::EguiWindow,
66
editor_windows::saving::{SaveWindow, SaveWindowAssetMeta},
77
},
88
};
@@ -367,14 +367,6 @@ pub fn handle_request_save_multiple(
367367

368368
let UiState { views, .. } = ui_state.into_inner();
369369

370-
match &mut views[active_view_idx] {
371-
EditorViewVariant::Legacy(view_state) => {
372-
view_state.dock_state.add_window(vec![window]);
373-
}
374-
375-
EditorViewVariant::Native(view_state) => {
376-
view_state.dock_state.add_window(vec![window]);
377-
}
378-
}
370+
views[active_view_idx].dock_state.add_window(vec![window]);
379371
}
380372
}

0 commit comments

Comments
 (0)