fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-15 22:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove Color struct from document-legacy (#1012)

Browse Source
This commit is contained in:
Keavon Chambers
2023-02-07 17:31:50 -08:00
parent 5462bf5f2f
commit 202b0ee6ed
28 changed files with 84 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/src/consts.rs
View File

@@ -1,4 +1,4 @@
use document_legacy::color::Color;
use graphene_core::raster::color::Color;
// Viewport
pub const VIEWPORT_ZOOM_WHEEL_RATE: f64 = (1. / 600.) * 3.;
@@ -68,7 +68,7 @@ pub const ASYMPTOTIC_EFFECT: f64 = 0.5;
pub const SCALE_EFFECT: f64 = 0.5;
// Colors
pub const COLOR_ACCENT: Color = Color::from_uchecked(0x00 as f32 / 255., 0xA8 as f32 / 255., 0xFF as f32 / 255.);
pub const COLOR_ACCENT: Color = Color::from_rgbf32_unchecked(0x00 as f32 / 255., 0xA8 as f32 / 255., 0xFF as f32 / 255.);
// Fonts
pub const DEFAULT_FONT_FAMILY: &str = "Merriweather";

2
editor/src/dispatcher.rs
View File

@@ -255,9 +255,9 @@ mod test {
use crate::messages::prelude::*;
use crate::test_utils::EditorTestUtils;
use document_legacy::color::Color;
use document_legacy::LayerId;
use document_legacy::Operation;
use graphene_core::raster::color::Color;
fn init_logger() {
let _ = env_logger::builder().is_test(true).try_init();

2
editor/src/messages/frontend/frontend_message.rs
View File

@@ -7,11 +7,11 @@ use crate::messages::portfolio::document::utility_types::layer_panel::{JsRawBuff
use crate::messages::prelude::*;
use crate::messages::tool::utility_types::HintData;
use document_legacy::color::Color;
use document_legacy::layers::text_layer::Font;
use document_legacy::LayerId;
use graph_craft::document::NodeId;
use graph_craft::imaginate_input::*;
use graphene_core::raster::color::Color;
use serde::{Deserialize, Serialize};

2
editor/src/messages/layout/layout_message_handler.rs
View File

@@ -5,9 +5,9 @@ use crate::messages::layout::utility_types::layout_widget::{DiffUpdate, Widget};
use crate::messages::layout::utility_types::layout_widget::{Layout, WidgetLayout};
use crate::messages::prelude::*;
use document_legacy::color::Color;
use document_legacy::layers::text_layer::Font;
use document_legacy::LayerId;
use graphene_core::raster::color::Color;
use serde_json::Value;
use std::ops::Not;

2
editor/src/messages/layout/utility_types/widgets/input_widgets.rs
View File

@@ -1,9 +1,9 @@
use crate::messages::input_mapper::utility_types::misc::ActionKeys;
use crate::messages::layout::utility_types::layout_widget::WidgetCallback;
use document_legacy::color::Color;
use document_legacy::layers::layer_info::LayerDataTypeDiscriminant;
use document_legacy::LayerId;
use graphene_core::raster::color::Color;
use graphite_proc_macros::WidgetBuilder;
use derivative::*;

2
editor/src/messages/portfolio/document/artboard/artboard_message_handler.rs
View File

@@ -2,12 +2,12 @@ use crate::application::generate_uuid;
use crate::messages::portfolio::utility_types::PersistentData;
use crate::messages::prelude::*;
use document_legacy::color::Color;
use document_legacy::document::Document as DocumentLegacy;
use document_legacy::layers::style::{self, Fill, RenderData, ViewMode};
use document_legacy::DocumentResponse;
use document_legacy::LayerId;
use document_legacy::Operation as DocumentOperation;
use graphene_core::raster::color::Color;
use glam::DAffine2;
use serde::{Deserialize, Serialize};

2
editor/src/messages/portfolio/document/document_message_handler.rs
View File

@@ -23,7 +23,6 @@ use crate::messages::prelude::*;
use crate::messages::tool::utility_types::ToolType;
use document_legacy::boolean_ops::BooleanOperationError;
use document_legacy::color::Color;
use document_legacy::document::Document as DocumentLegacy;
use document_legacy::layers::blend_mode::BlendMode;
use document_legacy::layers::folder_layer::FolderLayer;
@@ -32,6 +31,7 @@ use document_legacy::layers::style::{Fill, RenderData, ViewMode};
use document_legacy::layers::text_layer::Font;
use document_legacy::{DocumentError, DocumentResponse, LayerId, Operation as DocumentOperation};
use graph_craft::document::NodeId;
use graphene_core::raster::color::Color;
use graphene_std::vector::subpath::Subpath;
use glam::{DAffine2, DVec2};

2
editor/src/messages/portfolio/document/properties_panel/utility_functions.rs
View File

@@ -9,11 +9,11 @@ use crate::messages::layout::utility_types::widgets::label_widgets::{IconLabel,
use crate::messages::portfolio::utility_types::PersistentData;
use crate::messages::prelude::*;
use document_legacy::color::Color;
use document_legacy::document::Document;
use document_legacy::layers::layer_info::{Layer, LayerDataType, LayerDataTypeDiscriminant};
use document_legacy::layers::style::{Fill, Gradient, GradientType, LineCap, LineJoin, RenderData, Stroke, ViewMode};
use document_legacy::layers::text_layer::TextLayer;
use graphene_core::raster::color::Color;
use glam::{DAffine2, DVec2};
use std::f64::consts::PI;

2
editor/src/messages/portfolio/document/utility_types/error.rs
View File

@@ -1,5 +1,5 @@
use document_legacy::color::Color;
use document_legacy::DocumentError;
use graphene_core::raster::color::Color;
use thiserror::Error;

2
editor/src/messages/portfolio/document/utility_types/misc.rs
View File

@@ -1,9 +1,9 @@
pub use super::layer_panel::{LayerMetadata, LayerPanelEntry};
use crate::messages::prelude::ArtboardMessageHandler;
use document_legacy::color::Color;
use document_legacy::document::Document as DocumentLegacy;
use document_legacy::LayerId;
use graphene_core::raster::color::Color;
use serde::{Deserialize, Serialize};
use std::collections::HashMap;

2
editor/src/messages/portfolio/portfolio_message_handler.rs
View File

@@ -838,7 +838,7 @@ impl PortfolioMessageHandler {
let old_transforms = document.remove_document_transform();
let mask_is_some = mask_path.is_some();
let mask_image = mask_path.filter(|mask_layer_path| document.document_legacy.layer(mask_layer_path).is_ok()).map(|mask_layer_path| {
let render_mode = DocumentRenderMode::LayerCutout(&mask_layer_path, document_legacy::color::Color::WHITE);
let render_mode = DocumentRenderMode::LayerCutout(&mask_layer_path, graphene_core::raster::color::Color::WHITE);
let svg = document.render_document(size, transform.inverse(), &self.persistent_data, render_mode);
ImaginateMaskImage { svg, size }

2
editor/src/messages/tool/common_functionality/overlay_renderer.rs
View File

@@ -3,10 +3,10 @@ use crate::consts::VIEWPORT_GRID_ROUNDING_BIAS;
use crate::consts::{COLOR_ACCENT, HIDE_HANDLE_DISTANCE, MANIPULATOR_GROUP_MARKER_SIZE, PATH_OUTLINE_WEIGHT};
use crate::messages::prelude::*;
use document_legacy::color::Color;
use document_legacy::document::Document;
use document_legacy::layers::style::{self, Fill, Stroke};
use document_legacy::{LayerId, Operation};
use graphene_core::raster::color::Color;
use graphene_std::vector::consts::ManipulatorType;
use graphene_std::vector::manipulator_group::ManipulatorGroup;
use graphene_std::vector::manipulator_point::ManipulatorPoint;

2
editor/src/messages/tool/common_functionality/pivot.rs
View File

@@ -114,7 +114,7 @@ impl Pivot {
transform: DAffine2::IDENTITY.to_cols_array(),
style: style::PathStyle::new(
Some(style::Stroke::new(COLOR_ACCENT, PIVOT_OUTER_OUTLINE_THICKNESS)),
style::Fill::Solid(document_legacy::color::Color::WHITE),
style::Fill::Solid(graphene_core::raster::color::Color::WHITE),
),
insert_index: -1,
}

2
editor/src/messages/tool/common_functionality/transformation_cage.rs
View File

@@ -4,10 +4,10 @@ use crate::messages::frontend::utility_types::MouseCursorIcon;
use crate::messages::portfolio::document::utility_types::transformation::OriginalTransforms;
use crate::messages::prelude::*;
use document_legacy::color::Color;
use document_legacy::layers::style::{self, Fill, Stroke};
use document_legacy::LayerId;
use document_legacy::Operation;
use graphene_core::raster::color::Color;
use glam::{DAffine2, DVec2};

2
editor/src/messages/tool/tool_message.rs
View File

@@ -1,7 +1,7 @@
use super::utility_types::ToolType;
use crate::messages::prelude::*;
use document_legacy::color::Color;
use graphene_core::raster::color::Color;
use serde::{Deserialize, Serialize};

2
editor/src/messages/tool/tool_message_handler.rs
View File

@@ -6,8 +6,8 @@ use crate::messages::portfolio::utility_types::PersistentData;
use crate::messages::prelude::*;
use crate::messages::tool::utility_types::ToolType;
use document_legacy::color::Color;
use document_legacy::layers::style::RenderData;
use graphene_core::raster::color::Color;
#[derive(Debug, Default)]
pub struct ToolMessageHandler {

2
editor/src/messages/tool/tool_messages/gradient_tool.rs
View File

@@ -9,12 +9,12 @@ use crate::messages::tool::common_functionality::snapping::SnapManager;
use crate::messages::tool::utility_types::{EventToMessageMap, Fsm, ToolActionHandlerData, ToolMetadata, ToolTransition, ToolType};
use crate::messages::tool::utility_types::{HintData, HintGroup, HintInfo};
use document_legacy::color::Color;
use document_legacy::intersection::Quad;
use document_legacy::layers::layer_info::Layer;
use document_legacy::layers::style::{Fill, Gradient, GradientType, PathStyle, RenderData, Stroke};
use document_legacy::LayerId;
use document_legacy::Operation;
use graphene_core::raster::color::Color;
use glam::{DAffine2, DVec2};
use serde::{Deserialize, Serialize};

2
editor/src/messages/tool/utility_types.rs
View File

@@ -9,8 +9,8 @@ use crate::messages::layout::utility_types::widgets::input_widgets::SwatchPairIn
use crate::messages::layout::utility_types::widgets::label_widgets::{Separator, SeparatorDirection, SeparatorType};
use crate::messages::prelude::*;
use document_legacy::color::Color;
use document_legacy::layers::style::RenderData;
use graphene_core::raster::color::Color;
use serde::{Deserialize, Serialize};
use std::fmt::{self, Debug};

2
editor/src/test_utils.rs
View File

@@ -6,7 +6,7 @@ use crate::messages::portfolio::utility_types::Platform;
use crate::messages::prelude::*;
use crate::messages::tool::utility_types::ToolType;
use document_legacy::color::Color;
use graphene_core::raster::color::Color;
/// A set of utility functions to make the writing of editor test more declarative
pub trait EditorTestUtils {