mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-08-04 13:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix blend mode serialization and de-serialization to match (#400)

Browse source
This commit is contained in:
mfish33 2021-12-06 11:39:40 -08:00 • committed by Keavon Chambers
parent 20a4c76fd7
commit b854814076
3 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

34
frontend/src/components/panels/LayerTree.vue
View file

@ -216,41 +216,41 @@ import { SectionsOfMenuListEntries } from "@/components/widgets/floating-menus/M
const wasm = import("@/../wasm/pkg").then(panicProxy);
const blendModeEntries: SectionsOfMenuListEntries<BlendMode> = [
[{ label: "Normal", value: "normal" }],
[{ label: "Normal", value: "Normal" }],
[
{ label: "Multiply", value: "multiply" },
{ label: "Darken", value: "darken" },
{ label: "Color Burn", value: "color-burn" },
{ label: "Multiply", value: "Multiply" },
{ label: "Darken", value: "Darken" },
{ label: "Color Burn", value: "ColorBurn" },
// { label: "Linear Burn", value: "" }, // Not supported by SVG
// { label: "Darker Color", value: "" }, // Not supported by SVG
],
[
{ label: "Screen", value: "screen" },
{ label: "Lighten", value: "lighten" },
{ label: "Color Dodge", value: "color-dodge" },
{ label: "Screen", value: "Screen" },
{ label: "Lighten", value: "Lighten" },
{ label: "Color Dodge", value: "ColorDodge" },
// { label: "Linear Dodge (Add)", value: "" }, // Not supported by SVG
// { label: "Lighter Color", value: "" }, // Not supported by SVG
],
[
{ label: "Overlay", value: "overlay" },
{ label: "Soft Light", value: "soft-light" },
{ label: "Hard Light", value: "hard-light" },
{ label: "Overlay", value: "Overlay" },
{ label: "Soft Light", value: "SoftLight" },
{ label: "Hard Light", value: "HardLight" },
// { label: "Vivid Light", value: "" }, // Not supported by SVG
// { label: "Linear Light", value: "" }, // Not supported by SVG
// { label: "Pin Light", value: "" }, // Not supported by SVG
// { label: "Hard Mix", value: "" }, // Not supported by SVG
],
[
{ label: "Difference", value: "difference" },
{ label: "Exclusion", value: "exclusion" },
{ label: "Difference", value: "Difference" },
{ label: "Exclusion", value: "Exclusion" },
// { label: "Subtract", value: "" }, // Not supported by SVG
// { label: "Divide", value: "" }, // Not supported by SVG
],
[
{ label: "Hue", value: "hue" },
{ label: "Saturation", value: "saturation" },
{ label: "Color", value: "color" },
{ label: "Luminosity", value: "luminosity" },
{ label: "Hue", value: "Hue" },
{ label: "Saturation", value: "Saturation" },
{ label: "Color", value: "Color" },
{ label: "Luminosity", value: "Luminosity" },
],
];
@ -284,7 +284,7 @@ export default defineComponent({
(await wasm).toggle_layer_expansion(path);
},
async setLayerBlendMode() {
const blendMode = this.blendModeEntries.flat()[this.blendModeSelectedIndex].value as BlendMode;
const blendMode = this.blendModeEntries.flat()[this.blendModeSelectedIndex].value;
if (blendMode) {
(await wasm).set_blend_mode_for_selected_layers(blendMode);
}

32
frontend/src/utilities/js-messages.ts
View file

@ -194,22 +194,22 @@ function newPath(input: any): BigUint64Array {
}
export type BlendMode =
| "normal"
| "multiply"
| "darken"
| "color-burn"
| "screen"
| "lighten"
| "color-dodge"
| "overlay"
| "soft-light"
| "hard-light"
| "difference"
| "exclusion"
| "hue"
| "saturation"
| "color"
| "luminosity";
| "Normal"
| "Multiply"
| "Darken"
| "ColorBurn"
| "Screen"
| "Lighten"
| "ColorDodge"
| "Overlay"
| "SoftLight"
| "HardLight"
| "Difference"
| "Exclusion"
| "Hue"
| "Saturation"
| "Color"
| "Luminosity";
export class LayerPanelEntry {
name!: string;

32
frontend/wasm/src/type_translators.rs
View file

@ -35,22 +35,22 @@ pub fn translate_blend_mode(blend_mode_svg_style_name: &str) -> Option<BlendMode
use BlendMode::*;
let blend_mode = match blend_mode_svg_style_name {
"normal" => Normal,
"multiply" => Multiply,
"darken" => Darken,
"color-burn" => ColorBurn,
"screen" => Screen,
"lighten" => Lighten,
"color-dodge" => ColorDodge,
"overlay" => Overlay,
"soft-light" => SoftLight,
"hard-light" => HardLight,
"difference" => Difference,
"exclusion" => Exclusion,
"hue" => Hue,
"saturation" => Saturation,
"color" => Color,
"luminosity" => Luminosity,
"Normal" => Normal,
"Multiply" => Multiply,
"Darken" => Darken,
"ColorBurn" => ColorBurn,
"Screen" => Screen,
"Lighten" => Lighten,
"ColorDodge" => ColorDodge,
"Overlay" => Overlay,
"SoftLight" => SoftLight,
"HardLight" => HardLight,
"Difference" => Difference,
"Exclusion" => Exclusion,
"Hue" => Hue,
"Saturation" => Saturation,
"Color" => Color,
"Luminosity" => Luminosity,
_ => return None,
};