michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename the feature text → pf-text

This commit is contained in:
est31 2019-08-05 22:46:53 +02:00
parent 38df17696a
commit 3928e8d964
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
c/Cargo.toml
View File

@ -15,7 +15,7 @@ gl = "0.6"
libc = "0.2" libc = "0.2"
[dependencies.pathfinder_canvas] [dependencies.pathfinder_canvas]
features = ["text"] features = ["pf-text"]
path = "../canvas" path = "../canvas"
[dependencies.pathfinder_content] [dependencies.pathfinder_content]

2
canvas/Cargo.toml
View File

@ -29,4 +29,4 @@ rev = "a2d683856ba1f2d0095b12dd7823d1602a87614e"
optional = true optional = true
[features] [features]
text = ["pathfinder_text", "skribo", "font-kit"] pf-text = ["pathfinder_text", "skribo", "font-kit"]

8
canvas/src/lib.rs
View File

@ -26,14 +26,14 @@ use std::f32::consts::PI;
use std::mem; use std::mem;
use std::sync::Arc; use std::sync::Arc;
use text::FontCollection; use text::FontCollection;
#[cfg(feature = "text")] #[cfg(feature = "pf-text")]
pub use text::TextMetrics; pub use text::TextMetrics;
pub use text::CanvasFontContext; pub use text::CanvasFontContext;
const HAIRLINE_STROKE_WIDTH: f32 = 0.0333; const HAIRLINE_STROKE_WIDTH: f32 = 0.0333;
const DEFAULT_FONT_SIZE: f32 = 10.0; const DEFAULT_FONT_SIZE: f32 = 10.0;
#[cfg_attr(not(feature = "text"), path = "text_no_text.rs")] #[cfg_attr(not(feature = "pf-text"), path = "text_no_text.rs")]
mod text; mod text;
pub struct CanvasRenderingContext2D { pub struct CanvasRenderingContext2D {
@ -53,9 +53,9 @@ impl CanvasRenderingContext2D {
} }
pub fn from_scene(font_context: CanvasFontContext, scene: Scene) -> CanvasRenderingContext2D { pub fn from_scene(font_context: CanvasFontContext, scene: Scene) -> CanvasRenderingContext2D {
#[cfg(feature = "text")] #[cfg(feature = "pf-text")]
let default_font_collection = font_context.default_font_collection.clone(); let default_font_collection = font_context.default_font_collection.clone();
#[cfg(not(feature = "text"))] #[cfg(not(feature = "pf-text"))]
let default_font_collection = Arc::new(FontCollection); let default_font_collection = Arc::new(FontCollection);
CanvasRenderingContext2D { CanvasRenderingContext2D {
scene, scene,

2
examples/canvas_metal_minimal/Cargo.toml
View File

@ -13,7 +13,7 @@ sdl2 = "0.32"
sdl2-sys = "0.32" sdl2-sys = "0.32"
[dependencies.pathfinder_canvas] [dependencies.pathfinder_canvas]
features = ["text"] features = ["pf-text"]
path = "../../canvas" path = "../../canvas"
[dependencies.pathfinder_content] [dependencies.pathfinder_content]

2
examples/canvas_moire/Cargo.toml
View File

@ -10,7 +10,7 @@ sdl2 = "0.32"
sdl2-sys = "0.32" sdl2-sys = "0.32"
[dependencies.pathfinder_canvas] [dependencies.pathfinder_canvas]
features = ["text"] features = ["pf-text"]
path = "../../canvas" path = "../../canvas"
[dependencies.pathfinder_content] [dependencies.pathfinder_content]

2
examples/canvas_text/Cargo.toml
View File

@ -11,7 +11,7 @@ sdl2 = "0.32"
sdl2-sys = "0.32" sdl2-sys = "0.32"
[dependencies.pathfinder_canvas] [dependencies.pathfinder_canvas]
features = ["text"] features = ["pf-text"]
path = "../../canvas" path = "../../canvas"
[dependencies.pathfinder_content] [dependencies.pathfinder_content]