diff --git a/egui/src/context.rs b/egui/src/context.rs index 95c51c55..6c5f4449 100644 --- a/egui/src/context.rs +++ b/egui/src/context.rs @@ -8,6 +8,7 @@ use std::sync::{ use crate::{ animation_manager::AnimationManager, data::output::Output, + layers::GraphicLayers, mutex::{Mutex, MutexGuard}, paint::{stats::*, text::Fonts, *}, *, diff --git a/egui/src/lib.rs b/egui/src/lib.rs index aa733119..4bef92fb 100644 --- a/egui/src/lib.rs +++ b/egui/src/lib.rs @@ -86,7 +86,7 @@ pub(crate) mod grid; mod id; mod input_state; mod introspection; -mod layers; +pub mod layers; mod layout; mod memory; pub mod menu; @@ -118,7 +118,7 @@ pub use { grid::Grid, id::Id, input_state::*, - layers::*, + layers::{LayerId, Order}, layout::*, memory::Memory, painter::Painter, diff --git a/egui/src/memory.rs b/egui/src/memory.rs index 21e6c63a..a136b79c 100644 --- a/egui/src/memory.rs +++ b/egui/src/memory.rs @@ -380,7 +380,7 @@ impl Areas { pub(crate) fn visible_windows(&self) -> Vec<&area::State> { self.visible_layer_ids() .iter() - .filter(|layer| layer.order == crate::layers::Order::Middle) + .filter(|layer| layer.order == crate::Order::Middle) .filter_map(|layer| self.get(layer.id)) .collect() } diff --git a/egui/src/painter.rs b/egui/src/painter.rs index 7a2c0b33..8d00533a 100644 --- a/egui/src/painter.rs +++ b/egui/src/painter.rs @@ -1,11 +1,11 @@ use crate::{ - layers::ShapeIdx, + layers::{LayerId, ShapeIdx}, math::{Align2, Pos2, Rect, Vec2}, paint::{ text::{Fonts, Galley, TextStyle}, Shape, Stroke, }, - Color32, CtxRef, LayerId, + Color32, CtxRef, }; /// Helper to paint shapes and text to a specific region on a specific layer.