Move colors and sizing modules out of space_editor_tabs

crates/editor_tabs/src/lib.rs

@@ -1,40 +1,31 @@
-pub mod colors;
 /// This library contains dock-tab implementation for Space Editor
 pub mod editor_tab;
 pub mod schedule_editor_tab;
-pub mod sizing;
 pub mod start_layout;
 pub mod tab_name;
+pub mod tab_style;
 pub mod tab_viewer;
 
 use std::fmt::Display;
 
 use bevy::{ecs::system::CommandQueue, prelude::*, utils::HashMap, window::PrimaryWindow};
 
-use bevy_egui::egui::FontFamily::{Monospace, Proportional};
-use bevy_egui::{
-    egui::{self, FontId, Rounding},
-    EguiContext,
-};
+use bevy_egui::{egui, EguiContext};
 
-use colors::*;
 use editor_tab::*;
 use egui_dock::DockArea;
 use schedule_editor_tab::*;
-use sizing::{to_label, Sizing};
 use start_layout::StartLayout;
 use tab_name::{TabName, TabNameHolder};
+use tab_style::*;
 use tab_viewer::*;
 
-use bevy_egui::egui::TextStyle as ETextStyle;
-
 pub mod prelude {
-    pub use super::colors::*;
     pub use super::editor_tab::*;
     pub use super::schedule_editor_tab::*;
-    pub use super::sizing::*;
     pub use super::start_layout::*;
     pub use super::tab_name::*;
+    pub use super::tab_style::*;
     pub use super::tab_viewer::*;
 
     pub use super::{
@@ -55,29 +46,15 @@
     let mut egui_context = egui_context.clone();
     let ctx = egui_context.get_mut();
     egui_extras::install_image_loaders(ctx);
-    ctx.style_mut(|stl| {
-        stl.spacing.button_padding = bevy_egui::egui::Vec2::new(8., 2.);
-        stl.spacing.icon_spacing = 4.;
-        stl.spacing.icon_width = 16.;
-        stl.spacing.menu_margin = bevy_egui::egui::Margin {
-            left: 8.,
-            right: 8.,
-            top: 4.,
-            bottom: 8.,
-        };
-        stl.visuals.error_fg_color = ERROR_COLOR;
-        stl.visuals.hyperlink_color = HYPERLINK_COLOR;
-        stl.visuals.warn_fg_color = WARM_COLOR;
-        stl.visuals.menu_rounding = Rounding::same(0.5);
-        stl.text_styles = [
-            (ETextStyle::Small, FontId::new(10.0, Proportional)),
-            (ETextStyle::Body, FontId::new(12., Proportional)),
-            (ETextStyle::Button, FontId::new(14., Proportional)),
-            (ETextStyle::Heading, FontId::new(20.0, Proportional)),
-            (ETextStyle::Monospace, FontId::new(12.0, Monospace)),
-        ]
-        .into()
-    });
+
+    {
+        // set style for editor
+        let editor_ui = world.get_resource::<EditorUi>().unwrap();
+        let tab_style = (editor_ui.style_getter)(world);
+        ctx.style_mut(|stl| {
+            tab_style.set_egui_style(world, stl);
+        });
+    }
 
     world.resource_scope::<EditorUi, _>(|world, mut editor_ui| {
         editor_ui.ui(world, ctx);
@@ -89,18 +66,24 @@
 pub struct EditorUi {
     pub registry: HashMap<TabNameHolder, EditorUiReg>,
     pub tree: egui_dock::DockState<TabNameHolder>,
+    pub style_getter: fn(&World) -> &dyn TabStyle,
 }
 
 impl Default for EditorUi {
     fn default() -> Self {
         Self {
             registry: HashMap::default(),
             tree: egui_dock::DockState::new(vec![]),
+            style_getter: |_| &DEFAULT_STYLE,
         }
     }
 }
 
 impl EditorUi {
+    pub fn set_style<T: TabStyle>(&mut self) {
+        self.style_getter = |world: &World| world.resource::<T>();
+    }
+
     pub fn set_layout<T: StartLayout>(&mut self, layout: &T) {
         self.tree = layout.build();
     }
@@ -129,6 +112,12 @@
             }
         }
 
+        let collected_style = {
+            let editor = world.resource::<Self>();
+            let editor_style = (editor.style_getter)(world);
+            editor_style.collect_style(world)
+        };
+
         let cell = world.as_unsafe_world_cell();
 
         let mut command_queue = CommandQueue::default();
@@ -141,6 +130,7 @@
                 registry: &mut self.registry,
                 visible,
                 tab_commands: vec![],
+                style: collected_style,
             }
         };
 
@@ -218,10 +208,15 @@
         let reg = EditorUiReg::ResourceBased {
             show_command: show_fn,
             title_command: Box::new(|world| {
-                let sizing = world.resource::<Sizing>().clone();
+                let text_size = {
+                    let editor = world.resource::<EditorUi>();
+                    let editor_style = (editor.style_getter)(world);
+                    editor_style.text_size(world)
+                };
+
                 to_label(
                     world.resource_mut::<T>().tab_name().title.as_str(),
-                    sizing.text,
+                    text_size,
                 )
                 .into()
             }),

crates/editor_tabs/src/start_layout.rs

@@ -18,9 +18,9 @@
 }
 
 pub enum DoublePanel {
-    TopPanel,
-    BottomPanel,
-    MainPanel,
+    TopLeft,
+    BottomLeft,
+    Main,
 }
 
 #[derive(Default, Resource)]
@@ -51,17 +51,17 @@
 impl GroupLayout<DoublePanel> for DoublePanelGroup {
     fn push<N: TabName>(&mut self, group: DoublePanel, tab: N) {
         match group {
-            DoublePanel::TopPanel => self.top_panel.push(tab.into()),
-            DoublePanel::BottomPanel => self.bottom_panel.push(tab.into()),
-            DoublePanel::MainPanel => self.main_panel.push(tab.into()),
+            DoublePanel::TopLeft => self.top_panel.push(tab.into()),
+            DoublePanel::BottomLeft => self.bottom_panel.push(tab.into()),
+            DoublePanel::Main => self.main_panel.push(tab.into()),
         }
     }
 
     fn push_front<N: TabName>(&mut self, group: DoublePanel, tab: N) {
         match group {
-            DoublePanel::TopPanel => self.top_panel.insert(0, tab.into()),
-            DoublePanel::BottomPanel => self.bottom_panel.insert(0, tab.into()),
-            DoublePanel::MainPanel => self.main_panel.insert(0, tab.into()),
+            DoublePanel::TopLeft => self.top_panel.insert(0, tab.into()),
+            DoublePanel::BottomLeft => self.bottom_panel.insert(0, tab.into()),
+            DoublePanel::Main => self.main_panel.insert(0, tab.into()),
         }
     }
 }

crates/editor_tabs/src/tab_style.rs

@@ -0,0 +1,46 @@
+use bevy::prelude::*;
+use bevy_egui::egui::{self, RichText};
+
+pub const DEFAULT_STYLE: DefaultStyle = DefaultStyle;
+
+/// This trait use to get tab style
+pub trait TabStyle: Resource {
+    fn error_color(&self) -> egui::Color32;
+    fn set_egui_style(&self, world: &World, style: &mut egui::Style);
+    fn text_size(&self, world: &World) -> f32;
+
+    fn collect_style(&self, world: &World) -> CollectedStyle {
+        let error_color = self.error_color();
+        let text_size = self.text_size(world);
+        CollectedStyle {
+            error_color,
+            text_size,
+        }
+    }
+}
+
+pub struct CollectedStyle {
+    pub error_color: egui::Color32,
+    pub text_size: f32,
+}
+
+pub fn to_label(text: &str, size: f32) -> RichText {
+    RichText::new(text)
+        .size(size)
+        .family(egui_dock::egui::FontFamily::Proportional)
+}
+
+#[derive(Default, Resource)]
+pub struct DefaultStyle;
+
+impl TabStyle for DefaultStyle {
+    fn error_color(&self) -> egui::Color32 {
+        egui::Color32::RED
+    }
+
+    fn set_egui_style(&self, _world: &World, _style: &mut egui::Style) {}
+
+    fn text_size(&self, _world: &World) -> f32 {
+        14.0
+    }
+}

crates/editor_tabs/src/tab_viewer.rs

@@ -1,8 +1,6 @@
 use crate::{
-    prelude::{to_label, Sizing},
-    schedule_editor_tab::ScheduleEditorTabStorage,
-    tab_name::TabNameHolder,
-    EditorTab, EditorUiReg, ERROR_COLOR,
+    schedule_editor_tab::ScheduleEditorTabStorage, tab_name::TabNameHolder, to_label,
+    CollectedStyle, EditorTab, EditorUiReg,
 };
 use bevy::{prelude::*, utils::HashMap};
 use bevy_egui::egui;
@@ -22,6 +20,7 @@
     pub registry: &'a mut HashMap<TabNameHolder, EditorUiReg>,
     pub visible: Vec<TabNameHolder>,
     pub tab_commands: Vec<EditorTabCommand>,
+    pub style: CollectedStyle,
 }
 
 impl<'a, 'w, 's> egui_dock::TabViewer for EditorTabViewer<'a, 'w, 's> {
@@ -42,19 +41,21 @@
                             if let Some(tab) = storage.0.get_mut(tab_name) {
                                 tab.ui(ui, self.commands, world);
                             } else {
-                                ui.colored_label(ERROR_COLOR, "Not implemented schedule tab");
+                                ui.colored_label(
+                                    self.style.error_color,
+                                    "Not implemented schedule tab",
+                                );
                             }
                         },
                     );
                 }
             }
         } else {
-            ui.colored_label(ERROR_COLOR, "Not implemented panel");
+            ui.colored_label(self.style.error_color, "Not implemented panel");
         }
     }
 
     fn title(&mut self, tab: &mut Self::Tab) -> egui::WidgetText {
-        let sizing = self.world.resource::<Sizing>().clone();
         if let Some(reg) = self.registry.get(tab) {
             match reg {
                 EditorUiReg::ResourceBased {
@@ -67,12 +68,12 @@
                     .0
                     .get(tab)
                     .map_or_else(
-                        || to_label(&format!("{tab:?}"), sizing.text).into(),
-                        |tab| to_label(&tab.tab_name.title, sizing.text).into(),
+                        || to_label(&format!("{tab:?}"), self.style.text_size).into(),
+                        |tab| to_label(&tab.tab_name.title, self.style.text_size).into(),
                     ),
             }
         } else {
-            to_label(&format!("{tab:?}"), sizing.text).into()
+            to_label(&format!("{tab:?}"), self.style.text_size).into()
         }
     }
 

crates/editor_ui/src/camera_view.rs

@@ -23,6 +23,8 @@ use crate::{
 
 use space_editor_tabs::prelude::*;
 
+use crate::colors::*;
+
 pub struct CameraViewTabPlugin;
 
 impl Plugin for CameraViewTabPlugin {

crates/editor_ui/src/editor_style.rs

@@ -0,0 +1,43 @@
+use bevy::prelude::*;
+use space_editor_tabs::prelude::*;
+
+use crate::{colors::*, sizing::Sizing};
+use bevy_egui::egui::FontFamily::{Monospace, Proportional};
+use bevy_egui::egui::{FontId, Rounding, TextStyle as ETextStyle};
+
+#[derive(Resource, Default)]
+pub struct EditorStyle {}
+
+impl TabStyle for EditorStyle {
+    fn error_color(&self) -> bevy_egui::egui::Color32 {
+        ERROR_COLOR
+    }
+
+    fn set_egui_style(&self, _: &World, stl: &mut bevy_egui::egui::Style) {
+        stl.spacing.button_padding = bevy_egui::egui::Vec2::new(8., 2.);
+        stl.spacing.icon_spacing = 4.;
+        stl.spacing.icon_width = 16.;
+        stl.spacing.menu_margin = bevy_egui::egui::Margin {
+            left: 8.,
+            right: 8.,
+            top: 4.,
+            bottom: 8.,
+        };
+        stl.visuals.error_fg_color = ERROR_COLOR;
+        stl.visuals.hyperlink_color = HYPERLINK_COLOR;
+        stl.visuals.warn_fg_color = WARM_COLOR;
+        stl.visuals.menu_rounding = Rounding::same(0.5);
+        stl.text_styles = [
+            (ETextStyle::Small, FontId::new(10.0, Proportional)),
+            (ETextStyle::Body, FontId::new(12., Proportional)),
+            (ETextStyle::Button, FontId::new(14., Proportional)),
+            (ETextStyle::Heading, FontId::new(20.0, Proportional)),
+            (ETextStyle::Monospace, FontId::new(12.0, Monospace)),
+        ]
+        .into()
+    }
+
+    fn text_size(&self, world: &World) -> f32 {
+        world.resource::<Sizing>().text
+    }
+}

crates/editor_ui/src/game_view.rs

@@ -10,6 +10,8 @@ use crate::editor_tab_name::EditorTabName;
 use super::tool::EditorTool;
 use space_editor_tabs::prelude::*;
 
+use crate::colors::*;
+
 pub struct GameViewPlugin;
 
 impl Plugin for GameViewPlugin {

crates/editor_ui/src/inspector/events_dispatcher.rs

@@ -2,6 +2,7 @@ use bevy::{prelude::*, utils::HashMap};
 
 use bevy_egui::*;
 
+use crate::colors::*;
 use crate::prelude::*;
 
 #[derive(Resource, Default)]

crates/editor_ui/src/inspector/mod.rs

@@ -32,6 +32,7 @@ use self::{
     resources::ResourceTab,
     runtime_assets::RuntimeAssetsTab,
 };
+use crate::{colors::*, sizing::Sizing};
 
 /// Entities with this marker will be skipped in inspector
 #[derive(Component)]

crates/editor_ui/src/lib.rs

@@ -54,6 +54,11 @@ pub mod selection;
 /// Editor tab name
 pub mod editor_tab_name;
 
+pub mod colors;
+/// This module contains editor style definitions
+pub mod editor_style;
+pub mod sizing;
+
 pub mod icons;
 
 use bevy_debug_grid::{Grid, GridAxis, SubGrid, TrackedGrid, DEFAULT_GRID_ALPHA};

crates/editor_ui/src/menu_toolbars.rs

@@ -18,10 +18,13 @@ use space_undo::{AddedEntity, NewChange, RemovedEntity};
 use crate::{
     hierarchy::{HierarchyQueryIter, HierarchyTabState},
     icons::{add_bundle_icon, add_entity_icon, delete_entity_icon, prefab_icon},
+    sizing::{to_colored_richtext, to_richtext},
     ui_registration::{BundleReg, EditorBundleUntyped},
     ShowEditorUi,
 };
 
+use crate::{colors::*, sizing::Sizing};
+
 /// Plugin to activate bottom menu in editor UI
 pub struct BottomMenuPlugin;