me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename viewport to clip_bounds

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-12-02 15:53:02 +01:00
parent 43a7cc2222
commit b526ce4958
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
11 changed files with 53 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
wgpu/src/geometry.rs
View file

@ -346,7 +346,7 @@ impl Frame {
horizontal_alignment: text.horizontal_alignment,
vertical_alignment: text.vertical_alignment,
shaping: text.shaping,
viewport: bounds,
clip_bounds: Rectangle::with_size(Size::INFINITY),
});
}

14
wgpu/src/layer.rs
View file

@ -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 {

8
wgpu/src/layer/text.rs
View file

@ -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,
}

14
wgpu/src/text.rs
View file

@ -120,12 +120,12 @@ impl Pipeline {
horizontal_alignment,
vertical_alignment,
color,
viewport,
clip_bounds,
) = match section {
Text::Paragraph {
position,
color,
viewport,
clip_bounds,
..
} => {
use crate::core::text::Paragraph as _;
@ -141,13 +141,13 @@ impl Pipeline {
paragraph.horizontal_alignment(),
paragraph.vertical_alignment(),
*color,
*viewport,
*clip_bounds,
)
}
Text::Editor {
position,
color,
viewport,
clip_bounds,
..
} => {
use crate::core::text::Editor as _;
@ -163,7 +163,7 @@ impl Pipeline {
alignment::Horizontal::Left,
alignment::Vertical::Top,
*color,
*viewport,
*clip_bounds,
)
}
Text::Cached(text) => {
@ -182,7 +182,7 @@ impl Pipeline {
text.horizontal_alignment,
text.vertical_alignment,
text.color,
text.viewport,
text.clip_bounds,
)
}
};
@ -206,7 +206,7 @@ impl Pipeline {
};
let clip_bounds =
layer_bounds.intersection(&(viewport * scale_factor))?;
layer_bounds.intersection(&(clip_bounds * scale_factor))?;
Some(glyphon::TextArea {
buffer,