fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-26 03:48:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix clippy lints and update packages (#568)

Browse Source 
# Conflicts:
#	Cargo.lock
This commit is contained in:
0HyperCube
2022-03-14 14:23:08 -07:00
committed by Keavon Chambers
parent a1b91c75c7
commit bac34e3e64
9 changed files with 266 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphene/src/document.rs
+16 -16
View File
@@ -54,7 +54,7 @@ impl Document {
/// Checks whether each layer under `path` intersects with the provided `quad` and adds all intersection layers as paths to `intersections`.
pub fn intersects_quad(&self, quad: Quad, path: &mut Vec<LayerId>, intersections: &mut Vec<Vec<LayerId>>) {
self.layer(&path).unwrap().intersects_quad(quad, path, intersections);
self.layer(path).unwrap().intersects_quad(quad, path, intersections);
}
/// Checks whether each layer under the root path intersects with the provided `quad` and returns the paths to all intersecting layers.
@@ -257,7 +257,7 @@ impl Document {
let mut layer_id = None;
if let Ok((path, id)) = split_path(path) {
layer_id = Some(id);
self.mark_as_dirty(&path)?;
self.mark_as_dirty(path)?;
folder = self.folder_mut(path)?;
if let Some(folder_layer) = folder.layer_mut(id) {
*folder_layer = layer;
@@ -300,12 +300,12 @@ impl Document {
/// Deletes the layer specified by `path`.
pub fn delete(&mut self, path: &[LayerId]) -> Result<(), DocumentError> {
let (path, id) = split_path(path)?;
self.mark_as_dirty(&path)?;
self.mark_as_dirty(path)?;
self.folder_mut(path)?.remove_layer(id)
}
pub fn visible_layers(&self, path: &mut Vec<LayerId>, paths: &mut Vec<Vec<LayerId>>) -> Result<(), DocumentError> {
if !self.layer(&path)?.visible {
if !self.layer(path)?.visible {
return Ok(());
}
if let Ok(folder) = self.folder(&path) {
@@ -321,13 +321,13 @@ impl Document {
}
pub fn viewport_bounding_box(&self, path: &[LayerId]) -> Result<Option<[DVec2; 2]>, DocumentError> {
let layer = self.layer(&path)?;
let layer = self.layer(path)?;
let transform = self.multiply_transforms(path)?;
Ok(layer.data.bounding_box(transform))
}
pub fn bounding_box_and_transform(&self, path: &[LayerId]) -> Result<Option<([DVec2; 2], DAffine2)>, DocumentError> {
let layer = self.layer(&path)?;
let layer = self.layer(path)?;
let transform = self.multiply_transforms(&path[..path.len() - 1])?;
Ok(layer.data.bounding_box(layer.transform).map(|bounds| (bounds, transform)))
}
@@ -354,7 +354,7 @@ impl Document {
}
pub fn mark_downstream_as_dirty(&mut self, path: &[LayerId]) -> Result<(), DocumentError> {
let mut layer = self.layer_mut(&path)?;
let mut layer = self.layer_mut(path)?;
layer.cache_dirty = true;
let mut path = path.to_vec();
@@ -496,7 +496,7 @@ impl Document {
style,
size,
} => {
let layer = Layer::new(LayerDataType::Text(TextLayer::new(text.clone(), style, size)), transform);
let layer = Layer::new(LayerDataType::Text(TextLayer::new(text, style, size)), transform);
self.set_layer(&path, layer, insert_index)?;
@@ -508,7 +508,7 @@ impl Document {
Some(vec![DocumentChanged])
}
Operation::SetTextContent { path, new_text } => {
self.layer_mut(&path)?.as_text_mut()?.update_text(new_text.clone());
self.layer_mut(&path)?.as_text_mut()?.update_text(new_text);
self.mark_as_dirty(&path)?;
Some([vec![DocumentChanged], update_thumbnails_upstream(&path)].concat())
@@ -527,7 +527,7 @@ impl Document {
Some([vec![DocumentChanged, CreatedLayer { path: path.clone() }], update_thumbnails_upstream(&path)].concat())
}
Operation::AddOverlayShape { path, style, bez_path, closed } => {
let mut shape = ShapeLayer::from_bez_path(bez_path.clone(), style, closed);
let mut shape = ShapeLayer::from_bez_path(bez_path, style, closed);
shape.render_index = -1;
let layer = Layer::new(LayerDataType::Shape(shape), DAffine2::IDENTITY.to_cols_array());
@@ -543,7 +543,7 @@ impl Document {
bez_path,
closed,
} => {
let shape = ShapeLayer::from_bez_path(bez_path.clone(), style, closed);
let shape = ShapeLayer::from_bez_path(bez_path, style, closed);
self.set_layer(&path, Layer::new(LayerDataType::Shape(shape), transform), insert_index)?;
Some([vec![DocumentChanged, CreatedLayer { path }]].concat())
}
@@ -626,7 +626,7 @@ impl Document {
} => {
let (folder_path, layer_id) = split_path(&destination_path)?;
let folder = self.folder_mut(folder_path)?;
folder.add_layer(layer.clone(), Some(layer_id), insert_index).ok_or(DocumentError::IndexOutOfBounds)?;
folder.add_layer(layer, Some(layer_id), insert_index).ok_or(DocumentError::IndexOutOfBounds)?;
self.mark_as_dirty(&destination_path)?;
fn aggregate_insertions(folder: &FolderLayer, path: &mut Vec<LayerId>, responses: &mut Vec<DocumentResponse>) {
@@ -668,7 +668,7 @@ impl Document {
}
}
Operation::RenameLayer { layer_path: path, new_name: name } => {
self.layer_mut(&path)?.name = Some(name.clone());
self.layer_mut(&path)?.name = Some(name);
Some(vec![LayerChanged { path }])
}
Operation::CreateFolder { path } => {
@@ -700,7 +700,7 @@ impl Document {
self.mark_as_dirty(&path)?;
if let LayerDataType::Shape(shape) = &mut self.layer_mut(&path)?.data {
shape.path = bez_path.clone();
shape.path = bez_path;
}
Some(vec![DocumentChanged, LayerChanged { path }])
}
@@ -715,7 +715,7 @@ impl Document {
}
if let LayerDataType::Shape(shape) = &mut self.layer_mut(&path)?.data {
shape.path = bez_path.clone();
shape.path = bez_path;
}
Some([vec![DocumentChanged, LayerChanged { path: path.clone() }], update_thumbnails_upstream(&path)].concat())
}
@@ -755,7 +755,7 @@ impl Document {
Operation::SetLayerName { path, name } => {
self.mark_as_dirty(&path)?;
let mut layer = self.layer_mut(&path)?;
layer.name = if name.as_str() == "" { None } else { Some(name.clone()) };
layer.name = if name.as_str() == "" { None } else { Some(name) };
Some(vec![LayerChanged { path }])
}