Browse Source

Don't glob-include eveything in mod layers

pull/126/head
Emil Ernerfeldt 4 years ago
parent
commit
421e8bc91e
  1. 1
      egui/src/context.rs
  2. 4
      egui/src/lib.rs
  3. 2
      egui/src/memory.rs
  4. 4
      egui/src/painter.rs

1
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, *},
*,

4
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,

2
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()
}

4
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.

Loading…
Cancel
Save