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

dep: update glyphon to 0.4 #94

Merged
merged 1 commit into from
Jan 17, 2024
Merged

dep: update glyphon to 0.4 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ bytemuck = { version = "1.0", features = ["derive"] }
cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git", branch = "refactor" }
futures = "0.3"
glam = "0.24"
glyphon = { git = "https://github.com/jackpot51/glyphon.git", branch = "refactor" }
glyphon = "0.4"
guillotiere = "0.6"
half = "2.2"
image = "0.24"
Expand All @@ -156,7 +156,7 @@ resvg = "0.37"
rustc-hash = "1.0"
sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "2e9bf9f" }
smol = "1.0"
softbuffer = { git = "https://github.com/pop-os/softbuffer", tag = "v0.3-cosmic" }
softbuffer = { git = "https://github.com/pop-os/softbuffer", tag = "v0.3-cosmic" }
syntect = "5.1"
sysinfo = "0.28"
thiserror = "1.0"
Expand Down
10 changes: 2 additions & 8 deletions graphics/src/text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ pub use paragraph::Paragraph;

pub use cosmic_text;

use crate::color;
use crate::core::font::{self, Font};
use crate::core::text::Shaping;
use crate::core::{Color, Point, Rectangle, Size};
Expand Down Expand Up @@ -173,12 +172,7 @@ pub fn to_shaping(shaping: Shaping) -> cosmic_text::Shaping {

/// Converts some [`Color`] to a [`cosmic_text::Color`].
pub fn to_color(color: Color) -> cosmic_text::Color {
let [r, g, b, a] = color::pack(color).components();
let [r, g, b, a] = color.into_rgba8();

cosmic_text::Color::rgba(
(r * 255.0) as u8,
(g * 255.0) as u8,
(b * 255.0) as u8,
(a * 255.0) as u8,
)
cosmic_text::Color::rgba(r, g, b, a)
}
14 changes: 1 addition & 13 deletions tiny_skia/src/text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use crate::core::alignment;
use crate::core::text::{LineHeight, Shaping};
use crate::core::{Color, Font, Pixels, Point, Rectangle, Size};
use crate::graphics::color;
use crate::graphics::text::cache::{self, Cache};
use crate::graphics::text::editor;
use crate::graphics::text::font_system;
Expand Down Expand Up @@ -244,18 +243,7 @@ fn draw(
fn from_color(color: cosmic_text::Color) -> Color {
let [r, g, b, a] = color.as_rgba();

if color::GAMMA_CORRECTION {
// `cosmic_text::Color` is linear RGB in this case, so we
// need to convert back to sRGB
Color::from_linear_rgba(
r as f32 / 255.0,
g as f32 / 255.0,
b as f32 / 255.0,
a as f32 / 255.0,
)
} else {
Color::from_rgba8(r, g, b, a as f32 / 255.0)
}
Color::from_rgba8(r, g, b, a as f32 / 255.0)
}

#[derive(Debug, Clone, Default)]
Expand Down
Loading