Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #175

Merged
merged 2 commits into from
Mar 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions draw-cache/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ struct GlyphTexInfo {
tex_coords: Rectangle<u32>,
/// Used to calculate the bounds/texture pixel location for a similar glyph.
///
/// Each ordinate is calculated: `(bounds_ord - positon_ord) / g.scale`
/// Each ordinate is calculated: `(bounds_ord - position_ord) / g.scale`
bounds_minus_position_over_scale: Rect,
}

Expand Down Expand Up @@ -990,7 +990,7 @@ impl DrawCache {
/// glyph that is deemed close enough to the requested glyph as specified by
/// the cache tolerance parameters.
///
/// A sucessful result is `Some` if the glyph is not an empty glyph (no
/// A successful result is `Some` if the glyph is not an empty glyph (no
/// shape, and thus no rect to return).
///
/// Ensure that `font_id` matches the `font_id` that was passed to
Expand Down
2 changes: 1 addition & 1 deletion gfx-glyph/examples/varied.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ fn main() -> Result<(), Box<dyn Error>> {
},
},
Text {
text: "Eu facilisi maluisset eos.",
text: "Eu facilities maluisset eos.",
alexheretic marked this conversation as resolved.
Show resolved Hide resolved
scale: PxScale::from(55.0),
font_id: sans_font,
extra: Extra {
Expand Down
2 changes: 1 addition & 1 deletion gfx-glyph/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pub fn default_transform<D: IntoDimensions>(d: D) -> [[f32; 4]; 4] {
]
}

/// Object allowing glyph drawing, containing cache state. Manages glyph positioning cacheing,
/// Object allowing glyph drawing, containing cache state. Manages glyph positioning caching,
/// glyph draw caching & efficient GPU texture cache updating and re-sizing on demand.
///
/// Build using a [`GlyphBrushBuilder`](struct.GlyphBrushBuilder.html).
Expand Down
6 changes: 3 additions & 3 deletions glyph-brush/src/glyph_brush.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use std::{
/// A hash of `Section` data
type SectionHash = u64;

/// Object allowing glyph drawing, containing cache state. Manages glyph positioning cacheing,
/// Object allowing glyph drawing, containing cache state. Manages glyph positioning caching,
/// glyph draw caching & efficient GPU texture cache updating.
///
/// Build using a [`GlyphBrushBuilder`].
Expand Down Expand Up @@ -61,11 +61,11 @@ pub struct GlyphBrush<V, X = Extra, F = FontArc, H = DefaultSectionHasher> {
last_frame_seq_id_sections: Vec<SectionHashDetail>,
frame_seq_id_sections: Vec<SectionHashDetail>,

// buffer of section-layout hashs (that must exist in the calculate_glyph_cache)
// buffer of section-layout hashes (that must exist in the calculate_glyph_cache)
// to be used on the next `process_queued` call
section_buffer: Vec<SectionHash>,

// Set of section hashs to keep in the glyph cache this frame even if they haven't been drawn
// Set of section hashes to keep in the glyph cache this frame even if they haven't been drawn
keep_in_cache: FxHashSet<SectionHash>,

// config
Expand Down
14 changes: 7 additions & 7 deletions layout/src/builtin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -931,8 +931,8 @@ mod layout_test {
);
}

/// Chinese sentance squeezed into a vertical pipe meaning each character is on
/// a seperate line.
/// Chinese sentence squeezed into a vertical pipe meaning each character is on
/// a separate line.
#[test]
fn wrap_word_chinese() {
let glyphs = Layout::default().calculate_glyphs(
Expand Down Expand Up @@ -964,10 +964,10 @@ mod layout_test {
assert_eq!(y_positions.len(), 7, "{y_positions:?}");
}

/// #130 - Respect trailing whitespace in words if directly preceeding a hard break.
/// #130 - Respect trailing whitespace in words if directly preceding a hard break.
/// So right-aligned wrapped on 2 lines `Foo bar` will look different to `Foo \nbar`.
#[test]
fn include_spaces_in_layout_width_preceeded_hard_break() {
fn include_spaces_in_layout_width_preceded_hard_break() {
// should wrap due to width bound
let glyphs_no_newline = Layout::default()
.h_align(HorizontalAlign::Right)
Expand Down Expand Up @@ -1010,7 +1010,7 @@ mod layout_test {
.collect();
assert_eq!(y_positions.len(), 2, "{y_positions:?}");

// explict wrap should include the space in the layout width,
// explicit wrap should include the space in the layout width,
// so the explicit newline `F` should be to the left of the no_newline `F`.
let newline_f = &glyphs_newline[0];
let no_newline_f = &glyphs_no_newline[0];
Expand All @@ -1022,10 +1022,10 @@ mod layout_test {
);
}

/// #130 - Respect trailing whitespace in words if directly preceeding end-of-glyphs.
/// #130 - Respect trailing whitespace in words if directly preceding end-of-glyphs.
/// So right-aligned `Foo ` will look different to `Foo`.
#[test]
fn include_spaces_in_layout_width_preceeded_end() {
fn include_spaces_in_layout_width_preceded_end() {
let glyphs_no_newline = Layout::default()
.h_align(HorizontalAlign::Right)
.calculate_glyphs(
Expand Down
2 changes: 1 addition & 1 deletion layout/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pub trait GlyphPositioner: Hash {
/// Recalculate a glyph sequence after a change.
///
/// The default implementation simply calls `calculate_glyphs` so must be implemented
/// to provide benefits as such benefits are spefic to the internal layout logic.
/// to provide benefits as such benefits are specific to the internal layout logic.
fn recalculate_glyphs<F, S, P>(
&self,
previous: P,
Expand Down