summaryrefslogtreecommitdiffstats
path: root/wgpu/src/layer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--wgpu/src/layer.rs14
-rw-r--r--wgpu/src/layer/text.rs8
2 files changed, 11 insertions, 11 deletions
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index 60da3543..557a7633 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -75,7 +75,7 @@ impl<'a> Layer<'a> {
horizontal_alignment: alignment::Horizontal::Left,
vertical_alignment: alignment::Vertical::Top,
shaping: core::text::Shaping::Basic,
- viewport: Rectangle::with_size(Size::INFINITY),
+ clip_bounds: Rectangle::with_size(Size::INFINITY),
};
overlay.text.push(Text::Cached(text.clone()));
@@ -124,7 +124,7 @@ impl<'a> Layer<'a> {
paragraph,
position,
color,
- viewport,
+ clip_bounds,
} => {
let layer = &mut layers[current_layer];
@@ -132,14 +132,14 @@ impl<'a> Layer<'a> {
paragraph: paragraph.clone(),
position: *position + translation,
color: *color,
- viewport: *viewport + translation,
+ clip_bounds: *clip_bounds + translation,
});
}
Primitive::Editor {
editor,
position,
color,
- viewport,
+ clip_bounds,
} => {
let layer = &mut layers[current_layer];
@@ -147,7 +147,7 @@ impl<'a> Layer<'a> {
editor: editor.clone(),
position: *position + translation,
color: *color,
- viewport: *viewport + translation,
+ clip_bounds: *clip_bounds + translation,
});
}
Primitive::Text {
@@ -160,7 +160,7 @@ impl<'a> Layer<'a> {
horizontal_alignment,
vertical_alignment,
shaping,
- viewport,
+ clip_bounds,
} => {
let layer = &mut layers[current_layer];
@@ -174,7 +174,7 @@ impl<'a> Layer<'a> {
horizontal_alignment: *horizontal_alignment,
vertical_alignment: *vertical_alignment,
shaping: *shaping,
- viewport: *viewport + translation,
+ clip_bounds: *clip_bounds + translation,
}));
}
Primitive::Quad {
diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
index c4ea9185..df2f2875 100644
--- a/wgpu/src/layer/text.rs
+++ b/wgpu/src/layer/text.rs
@@ -13,7 +13,7 @@ pub enum Text<'a> {
paragraph: paragraph::Weak,
position: Point,
color: Color,
- viewport: Rectangle,
+ clip_bounds: Rectangle,
},
/// An editor.
#[allow(missing_docs)]
@@ -21,7 +21,7 @@ pub enum Text<'a> {
editor: editor::Weak,
position: Point,
color: Color,
- viewport: Rectangle,
+ clip_bounds: Rectangle,
},
/// A cached text.
Cached(Cached<'a>),
@@ -56,6 +56,6 @@ pub struct Cached<'a> {
/// The shaping strategy of the text.
pub shaping: text::Shaping,
- /// The viewport of the text.
- pub viewport: Rectangle,
+ /// The clip bounds of the text.
+ pub clip_bounds: Rectangle,
}