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.

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

Jump to bottom

Bump versions of pango, cairo #563

Merged
merged 4 commits into from
Feb 5, 2024
Merged

Bump versions of pango, cairo #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
423fee8
Bump versions of pango, cairo, svg crates
flxzt Feb 4, 2024
f1858a8
satisfy clippy
flxzt Feb 4, 2024
001d565
remove unused imports in piet-direct2d
flxzt Feb 4, 2024
d880276
remove another unused import in piet-direct2d
flxzt Feb 4, 2024
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
6 changes: 3 additions & 3 deletions piet-cairo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ categories = ["rendering::graphics-api"]
[dependencies]
piet = { version = "=0.6.2", path = "../piet" }

cairo-rs = { version = "0.18.0", default-features = false } # We don't need glib
pango = { version = "0.18.0", features = ["v1_44"] }
pangocairo = "0.18.0"
cairo-rs = { version = "0.19.0", default-features = false } # We don't need glib
pango = { version = "0.19.0", features = ["v1_44"] }
pangocairo = "0.19.0"
unicode-segmentation = "1.10.0"
xi-unicode = "0.3.0"

Expand Down
2 changes: 1 addition & 1 deletion piet-cairo/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ impl<'a> RenderContext for CairoRenderContext<'a> {
let pos = pos.into();
let offset = layout.pango_offset();
self.ctx.move_to(pos.x - offset.x, pos.y - offset.y);
pangocairo::show_layout(self.ctx, layout.pango_layout());
pangocairo::functions::show_layout(self.ctx, layout.pango_layout());
}

fn save(&mut self) -> Result<(), Error> {
Expand Down
4 changes: 2 additions & 2 deletions piet-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ png = { version = "0.17.7", optional = true }

[target.'cfg(any(target_os="linux", target_os="openbsd", target_os="freebsd", target_os="netbsd"))'.dependencies]
piet-cairo = { version = "=0.6.2", path = "../piet-cairo" }
cairo-rs = { version = "0.18.0", default_features = false }
cairo-sys-rs = { version = "0.18.0" }
cairo-rs = { version = "0.19.0", default_features = false }
cairo-sys-rs = { version = "0.19.0" }

[target.'cfg(any(target_os="macos", target_os="ios"))'.dependencies]
piet-coregraphics = { version = "=0.6.2", path = "../piet-coregraphics" }
Expand Down
2 changes: 0 additions & 2 deletions piet-direct2d/src/text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use std::ops::{Range, RangeBounds};
use std::rc::Rc;
use std::sync::Arc;

pub use d2d::{D2DDevice, D2DFactory, DeviceContext as D2DDeviceContext};
pub use dwrite::DwriteFactory;
use dwrote::{CustomFontCollectionLoaderImpl, FontCollection, FontFile};
use winapi::um::d2d1::D2D1_DRAW_TEXT_OPTIONS_NONE;
Expand All @@ -23,7 +22,6 @@ use piet::{
};

use crate::conv;
use crate::d2d;
use crate::dwrite::{self, TextFormat, Utf16Range};
use crate::D2DRenderContext;

Expand Down
2 changes: 1 addition & 1 deletion piet-web/src/text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ impl TextLayout for WebTextLayout {
// this assumes that all heights/baselines are the same.
// Uses line bounding box to do hit testpoint, but with coordinates starting at 0.0 at
// first baseline
let first_baseline = self.line_metrics.get(0).map(|l| l.baseline).unwrap_or(0.0);
let first_baseline = self.line_metrics.first().map(|l| l.baseline).unwrap_or(0.0);

// check out of bounds above top
// out of bounds on bottom during iteration
Expand Down
Loading