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

Upgrade Graphite to Rust 2021 edition; upgrade dependencies (#387)

Browse Source 
* Upgrade Graphite to Rust 2021 edition; upgrade dependencies

* Fix CI

* Move changes to the project Cargo.tomls

* Remove unnecessary 2021 edition upgrade tweak

* Show version number before and after updating rustc

Co-authored-by: Dennis Kobert <dennis@kobert.dev>
# Conflicts:
#	Cargo.lock
This commit is contained in:
Keavon Chambers
2021-11-01 00:00:22 -07:00
parent 029b8ff8b3
commit 330697bb98
8 changed files with 70 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editor/Cargo.toml
View File

@@ -1,8 +1,9 @@
[package]
name = "graphite-editor"
version = "0.1.0"
rust-version = "1.56.0"
authors = ["Graphite Authors <contact@graphite.design>"]
edition = "2018"
edition = "2021"
readme = "../README.md"
homepage = "https://www.graphite.design"
repository = "https://github.com/GraphiteEditor/Graphite"

2
editor/src/document/document_file.rs
View File

@@ -637,7 +637,7 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
let scrollbar_size = viewport_size / bounds_length;
let log = root_layerdata.scale.log2();
let mut ruler_inverval = if log < 0. { 100. * 2_f64.powf(-log.ceil()) } else { 100. / 2_f64.powf(log.ceil()) };
let ruler_inverval = if log < 0. { 100. * 2_f64.powf(-log.ceil()) } else { 100. / 2_f64.powf(log.ceil()) };
let ruler_spacing = ruler_inverval * root_layerdata.scale;
let ruler_origin = self.graphene_document.root.transform.transform_point2(DVec2::ZERO);