From 3ad8075a286341083e8ef20fd85adbfbf4db082b Mon Sep 17 00:00:00 2001 From: dscyrescotti Date: Wed, 15 May 2024 13:43:22 +0700 Subject: [PATCH] feat: update canvas zoom scale --- Memola/Canvas/Core/Canvas.swift | 4 +--- Memola/Canvas/Tool/Pen/PenStyles/EraserPenStyle.swift | 2 +- Memola/Canvas/Tool/Pen/PenStyles/MarkerPenStyle.swift | 2 +- Memola/Canvas/View/Bridge/Views/DrawingView.swift | 2 +- Memola/Features/Memos/MemosView.swift | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Memola/Canvas/Core/Canvas.swift b/Memola/Canvas/Core/Canvas.swift index 6275f69..a2471c5 100644 --- a/Memola/Canvas/Core/Canvas.swift +++ b/Memola/Canvas/Core/Canvas.swift @@ -18,7 +18,7 @@ final class Canvas: ObservableObject, Identifiable, @unchecked Sendable { var graphicContext = GraphicContext() let viewPortContext = ViewPortContext() - let maximumZoomScale: CGFloat = 30 + let maximumZoomScale: CGFloat = 35 let minimumZoomScale: CGFloat = 5 let defaultZoomScale: CGFloat = 20 @@ -48,7 +48,6 @@ extension Canvas { func load() { withPersistence(\.backgroundContext) { [weak self, canvasID, bounds] context in DispatchQueue.main.async { [weak self] in - NSLog(Date().formatted(.dateTime.minute().second().secondFraction(.fractional(2)))) self?.state = .loading } guard let canvas = context.object(with: canvasID) as? CanvasObject else { @@ -59,7 +58,6 @@ extension Canvas { self?.graphicContext.loadStrokes(bounds) context.refresh(canvas, mergeChanges: false) DispatchQueue.main.async { [weak self] in - NSLog(Date().formatted(.dateTime.minute().second().secondFraction(.fractional(2)))) self?.state = .loaded } } diff --git a/Memola/Canvas/Tool/Pen/PenStyles/EraserPenStyle.swift b/Memola/Canvas/Tool/Pen/PenStyles/EraserPenStyle.swift index 25ca7c8..a18d8df 100644 --- a/Memola/Canvas/Tool/Pen/PenStyles/EraserPenStyle.swift +++ b/Memola/Canvas/Tool/Pen/PenStyles/EraserPenStyle.swift @@ -12,7 +12,7 @@ struct EraserPenStyle: PenStyle { var textureName: String = "point-texture" - var thinkness: (min: CGFloat, max: CGFloat) = (1, 120) + var thinkness: (min: CGFloat, max: CGFloat) = (0.5, 120) var color: [CGFloat] = [1, 1, 1, 0] diff --git a/Memola/Canvas/Tool/Pen/PenStyles/MarkerPenStyle.swift b/Memola/Canvas/Tool/Pen/PenStyles/MarkerPenStyle.swift index 0b821d8..ed82047 100644 --- a/Memola/Canvas/Tool/Pen/PenStyles/MarkerPenStyle.swift +++ b/Memola/Canvas/Tool/Pen/PenStyles/MarkerPenStyle.swift @@ -12,7 +12,7 @@ struct MarkerPenStyle: PenStyle { var textureName: String = "point-texture" - var thinkness: (min: CGFloat, max: CGFloat) = (1, 120) + var thinkness: (min: CGFloat, max: CGFloat) = (0.5, 120) var color: [CGFloat] = [1, 0.38, 0.38, 1] diff --git a/Memola/Canvas/View/Bridge/Views/DrawingView.swift b/Memola/Canvas/View/Bridge/Views/DrawingView.swift index 0b798e2..84b58d5 100644 --- a/Memola/Canvas/View/Bridge/Views/DrawingView.swift +++ b/Memola/Canvas/View/Bridge/Views/DrawingView.swift @@ -32,7 +32,7 @@ class DrawingView: UIView { } func updateDrawableSize(with size: CGSize) { - renderView.drawableSize = size.multiply(by: 2.0) + renderView.drawableSize = size.multiply(by: 3) } override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool { diff --git a/Memola/Features/Memos/MemosView.swift b/Memola/Features/Memos/MemosView.swift index 1b4f079..57c6395 100644 --- a/Memola/Features/Memos/MemosView.swift +++ b/Memola/Features/Memos/MemosView.swift @@ -69,8 +69,8 @@ struct MemosView: View { memoObject.updatedAt = .now let canvasObject = CanvasObject(context: managedObjectContext) - canvasObject.width = 4_000 - canvasObject.height = 4_000 + canvasObject.width = 8_000 + canvasObject.height = 8_000 let graphicContextObject = GraphicContextObject(context: managedObjectContext) graphicContextObject.strokes = []