Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpui: Fix SVG color render, when color have alpha (#20537)

Browse source 
Release Notes:

- N/A


## Demo

- [Source
SVG](https://github.com/user-attachments/assets/1c681e01-baba-4613-a3e7-ea5cb3015406)
click here open in browser.

| Before | After |
| --- | --- |
| <img width="1212" alt="image"
src="https://github.com/user-attachments/assets/ba323b13-538b-4a34-bb64-9dcf490aface">
| <img width="1212" alt="image"
src="https://github.com/user-attachments/assets/4635926a-843e-426d-89a1-4e9b4f4cc37e">
|

---------

Co-authored-by: Floyd Wang <gassnake999@gmail.com>
This commit is contained in:
Jason Lee 2024-11-16 22:53:57 +08:00 • committed by GitHub
parent 65a9c8d994
commit 932c7e23c8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/gpui/examples/image/color.svg
View file

@ -6,8 +6,8 @@
<circle cx="240" cy="100" r="30" stroke="#dc2626" /> <circle cx="240" cy="100" r="30" stroke="#dc2626" />
<circle cx="380" cy="100" r="20" stroke="#d97706" /> <circle cx="380" cy="100" r="20" stroke="#d97706" />
<circle cx="380" cy="240" r="30" stroke="#06b6d4" /> <circle cx="380" cy="240" r="30" stroke="#06b6d4" />
<circle cx="100" cy="240" r="30" stroke="#3b82f6" /> <circle cx="100" cy="240" r="30" stroke="#3b82f666" />
<circle cx="240" cy="380" r="30" stroke="#7c3aed" /> <circle cx="240" cy="380" r="30" stroke="#7c3aed" />
<circle cx="380" cy="380" r="20" stroke="#c026d3" /> <circle cx="380" cy="380" r="20" stroke="#c026d3" />
<circle cx="100" cy="380" r="20" stroke="#e11d48" /> <circle cx="100" cy="380" r="20" stroke="#e11d4866" />
</svg> </svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 741 B

After

Width:  |  Height:  |  Size: 746 B

Before After
Before After

11
crates/gpui/src/color.rs
View file

@ -22,6 +22,17 @@ pub fn rgba(hex: u32) -> Rgba {
Rgba { r, g, b, a } Rgba { r, g, b, a }
} }
/// Swap from RGBA with premultiplied alpha to BGRA
pub(crate) fn swap_rgba_pa_to_bgra(color: &mut [u8]) {
color.swap(0, 2);
if color[3] > 0 {
let a = color[3] as f32 / 255.;
color[0] = (color[0] as f32 / a) as u8;
color[1] = (color[1] as f32 / a) as u8;
color[2] = (color[2] as f32 / a) as u8;
}
}
/// An RGBA color /// An RGBA color
#[derive(PartialEq, Clone, Copy, Default)] #[derive(PartialEq, Clone, Copy, Default)]
pub struct Rgba { pub struct Rgba {

11
crates/gpui/src/elements/img.rs
View file

@ -1,8 +1,8 @@
use crate::{ use crate::{
px, AbsoluteLength, AnyElement, AppContext, Asset, AssetLogger, Bounds, DefiniteLength, px, swap_rgba_pa_to_bgra, AbsoluteLength, AnyElement, AppContext, Asset, AssetLogger, Bounds,
Element, ElementId, GlobalElementId, Hitbox, Image, InteractiveElement, Interactivity, DefiniteLength, Element, ElementId, GlobalElementId, Hitbox, Image, InteractiveElement,
IntoElement, LayoutId, Length, ObjectFit, Pixels, RenderImage, Resource, SharedString, Interactivity, IntoElement, LayoutId, Length, ObjectFit, Pixels, RenderImage, Resource,
SharedUri, StyleRefinement, Styled, SvgSize, Task, WindowContext, SharedString, SharedUri, StyleRefinement, Styled, SvgSize, Task, WindowContext,
}; };
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
@ -564,9 +564,8 @@ impl Asset for ImageAssetLoader {
let mut buffer = let mut buffer =
ImageBuffer::from_raw(pixmap.width(), pixmap.height(), pixmap.take()).unwrap(); ImageBuffer::from_raw(pixmap.width(), pixmap.height(), pixmap.take()).unwrap();
// Convert from RGBA to BGRA.
for pixel in buffer.chunks_exact_mut(4) { for pixel in buffer.chunks_exact_mut(4) {
pixel.swap(0, 2); swap_rgba_pa_to_bgra(pixel);
} }
RenderImage::new(SmallVec::from_elem(Frame::new(buffer), 1)) RenderImage::new(SmallVec::from_elem(Frame::new(buffer), 1))

13
crates/gpui/src/platform/mac/text_system.rs
View file

@ -1,7 +1,8 @@
use crate::{ use crate::{
point, px, size, Bounds, DevicePixels, Font, FontFallbacks, FontFeatures, FontId, FontMetrics, point, px, size, swap_rgba_pa_to_bgra, Bounds, DevicePixels, Font, FontFallbacks, FontFeatures,
FontRun, FontStyle, FontWeight, GlyphId, LineLayout, Pixels, PlatformTextSystem, Point, FontId, FontMetrics, FontRun, FontStyle, FontWeight, GlyphId, LineLayout, Pixels,
RenderGlyphParams, Result, ShapedGlyph, ShapedRun, SharedString, Size, SUBPIXEL_VARIANTS, PlatformTextSystem, Point, RenderGlyphParams, Result, ShapedGlyph, ShapedRun, SharedString,
Size, SUBPIXEL_VARIANTS,
}; };
use anyhow::anyhow; use anyhow::anyhow;
use cocoa::appkit::CGFloat; use cocoa::appkit::CGFloat;
@ -418,11 +419,7 @@ impl MacTextSystemState {
if params.is_emoji { if params.is_emoji {
// Convert from RGBA with premultiplied alpha to BGRA with straight alpha. // Convert from RGBA with premultiplied alpha to BGRA with straight alpha.
for pixel in bytes.chunks_exact_mut(4) { for pixel in bytes.chunks_exact_mut(4) {
pixel.swap(0, 2); swap_rgba_pa_to_bgra(pixel);
let a = pixel[3] as f32 / 255.;
pixel[0] = (pixel[0] as f32 / a) as u8;
pixel[1] = (pixel[1] as f32 / a) as u8;
pixel[2] = (pixel[2] as f32 / a) as u8;
} }
} }