mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-25 19:29:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Introduce Scene::push_foreground_layer

Browse source
This commit is contained in:
Antonio Scandurra 2021-08-30 15:41:16 +02:00
parent 18d175a240
commit 2b39107b49
2 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gpui/src/platform/mac/renderer.rs
View file

@ -142,7 +142,7 @@ impl Renderer {
let mut sprites = Vec::new();
let mut vertices = Vec::<shaders::GPUIPathVertex>::new();
let mut current_atlas_id = None;
for (layer_id, layer) in scene.layers().iter().enumerate() {
for (layer_id, layer) in scene.layers().enumerate() {
for path in layer.paths() {
let origin = path.bounds.origin() * scene.scale_factor();
let size = (path.bounds.size() * scene.scale_factor()).ceil();
@ -285,7 +285,7 @@ impl Renderer {
let mut path_sprites = path_sprites.into_iter().peekable();
for (layer_id, layer) in scene.layers().iter().enumerate() {
for (layer_id, layer) in scene.layers().enumerate() {
self.clip(scene, layer, drawable_size, command_encoder);
self.render_shadows(scene, layer, offset, drawable_size, command_encoder);
self.render_quads(scene, layer, offset, drawable_size, command_encoder);

42
gpui/src/scene.rs
View file

@ -12,7 +12,9 @@ use crate::{
pub struct Scene {
scale_factor: f32,
layers: Vec<Layer>,
active_layer_stack: Vec<usize>,
foreground_layers: Vec<Layer>,
active_layer_stack: Vec<(usize, bool)>,
pending_foreground_layers: usize,
}
#[derive(Default)]
@ -123,7 +125,9 @@ impl Scene {
Scene {
scale_factor,
layers: vec![Layer::new(None)],
active_layer_stack: vec![0],
foreground_layers: Default::default(),
active_layer_stack: vec![(0, false)],
pending_foreground_layers: 0,
}
}
@ -131,19 +135,32 @@ impl Scene {
self.scale_factor
}
pub fn layers(&self) -> &[Layer] {
self.layers.as_slice()
pub fn layers(&self) -> impl Iterator<Item = &Layer> {
self.layers.iter().chain(self.foreground_layers.iter())
}
pub fn push_layer(&mut self, clip_bounds: Option<RectF>) {
let ix = self.layers.len();
self.layers.push(Layer::new(clip_bounds));
self.active_layer_stack.push(ix);
if self.pending_foreground_layers == 0 {
let ix = self.layers.len();
self.layers.push(Layer::new(clip_bounds));
self.active_layer_stack.push((ix, false));
} else {
let ix = self.foreground_layers.len();
self.foreground_layers.push(Layer::new(clip_bounds));
self.active_layer_stack.push((ix, true));
}
}
pub fn push_foreground_layer(&mut self, clip_bounds: Option<RectF>) {
self.pending_foreground_layers += 1;
self.push_layer(clip_bounds);
}
pub fn pop_layer(&mut self) {
assert!(self.active_layer_stack.len() > 1);
self.active_layer_stack.pop();
let (_, foreground) = self.active_layer_stack.pop().unwrap();
if foreground {
self.pending_foreground_layers -= 1;
}
}
pub fn push_quad(&mut self, quad: Quad) {
@ -167,7 +184,12 @@ impl Scene {
}
fn active_layer(&mut self) -> &mut Layer {
&mut self.layers[*self.active_layer_stack.last().unwrap()]
let (ix, foreground) = *self.active_layer_stack.last().unwrap();
if foreground {
&mut self.foreground_layers[ix]
} else {
&mut self.layers[ix]
}
}
}