summaryrefslogtreecommitdiffstats
path: root/wgpu/src/renderer.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-10-30 03:31:07 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-10-30 03:31:07 +0100
commit63cd0fd8eb1eebae8de7d5141c846fc4ea55d702 (patch)
treee0a427a35435ad5fe5ce98a0b5050a1026a80207 /wgpu/src/renderer.rs
parent85916c9e8710ee90cbf37d384acbb6d208ff1da3 (diff)
downloadiced-63cd0fd8eb1eebae8de7d5141c846fc4ea55d702.tar.gz
iced-63cd0fd8eb1eebae8de7d5141c846fc4ea55d702.tar.bz2
iced-63cd0fd8eb1eebae8de7d5141c846fc4ea55d702.zip
Draft `TextInput` widget structure
Also started a `todos` example to showcase it!
Diffstat (limited to 'wgpu/src/renderer.rs')
-rw-r--r--wgpu/src/renderer.rs22
1 files changed, 14 insertions, 8 deletions
diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs
index a70693af..fbc39327 100644
--- a/wgpu/src/renderer.rs
+++ b/wgpu/src/renderer.rs
@@ -23,6 +23,7 @@ mod row;
mod scrollable;
mod slider;
mod text;
+mod text_input;
pub struct Renderer {
surface: Surface,
@@ -148,7 +149,8 @@ impl Renderer {
});
let mut layers = Vec::new();
- let mut current = Layer::new(
+
+ layers.push(Layer::new(
Rectangle {
x: 0,
y: 0,
@@ -156,10 +158,9 @@ impl Renderer {
height: u32::from(target.height),
},
0,
- );
+ ));
- self.draw_primitive(primitive, &mut current, &mut layers);
- layers.push(current);
+ self.draw_primitive(primitive, &mut layers);
for layer in layers {
self.flush(
@@ -178,15 +179,16 @@ impl Renderer {
fn draw_primitive<'a>(
&mut self,
primitive: &'a Primitive,
- layer: &mut Layer<'a>,
layers: &mut Vec<Layer<'a>>,
) {
+ let layer = layers.last_mut().unwrap();
+
match primitive {
Primitive::None => {}
Primitive::Group { primitives } => {
// TODO: Inspect a bit and regroup (?)
for primitive in primitives {
- self.draw_primitive(primitive, layer, layers)
+ self.draw_primitive(primitive, layers)
}
}
Primitive::Text {
@@ -275,7 +277,7 @@ impl Renderer {
offset,
content,
} => {
- let mut new_layer = Layer::new(
+ let clip_layer = Layer::new(
Rectangle {
x: bounds.x as u32,
y: bounds.y as u32 - layer.y_offset,
@@ -285,8 +287,12 @@ impl Renderer {
layer.y_offset + offset,
);
+ let new_layer = Layer::new(layer.bounds, layer.y_offset);
+
+ layers.push(clip_layer);
+
// TODO: Primitive culling
- self.draw_primitive(content, &mut new_layer, layers);
+ self.draw_primitive(content, layers);
layers.push(new_layer);
}