Skip to content

add reset method for CanvasRenderingContext2D #446

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

add reset method for CanvasRenderingContext2D #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
665f949
add reset method for CanvasRenderingContext2D
colorhook Nov 5, 2020
7d62881
change font-kit version
colorhook Dec 1, 2020
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
2 changes: 1 addition & 1 deletion canvas/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ keywords = ["pathfinder", "canvas", "vector", "graphics", "gpu"]
crate-type = ["rlib", "staticlib"]

[dependencies]
font-kit = { version = "0.6", optional = true }
font-kit = { version = "0.10", optional = true }

[dependencies.pathfinder_color]
path = "../color"
Expand Down
9 changes: 9 additions & 0 deletions canvas/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,11 @@ impl CanvasRenderingContext2D {
}

// Extensions
pub fn reset(&mut self) {
self.saved_states = vec![];
self.current_state.reset();
self.clear();
}

/// Clears the current canvas.
pub fn clear(&mut self) {
Expand Down Expand Up @@ -679,6 +684,10 @@ impl State {
}
}

fn reset(&mut self) {
*self = State::default(self.font_collection.clone());
}

fn resolve_paint<'a>(&self, paint: &'a Paint) -> Cow<'a, Paint> {
let mut must_copy = !self.transform.is_identity() || self.global_alpha < 1.0;
if !must_copy {
Expand Down
2 changes: 1 addition & 1 deletion examples/canvas_text/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
edition = "2018"

[dependencies]
font-kit = "0.6"
font-kit = "0.10"
gl = "0.14"
sdl2 = "0.33"
sdl2-sys = "0.33"
Expand Down
2 changes: 1 addition & 1 deletion text/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = "https://github.com/servo/pathfinder"
homepage = "https://github.com/servo/pathfinder"

[dependencies]
font-kit = "0.6"
font-kit = "0.10"

[dependencies.pathfinder_content]
path = "../content"
Expand Down