mirror of
https://github.com/dscyrescotti/Memola.git
synced 2026-01-14 13:13:25 +01:00
[PR #27] [MERGED] Redesign pen tool of memo canvas view #50
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/dscyrescotti/Memola/pull/27
Author: @dscyrescotti
Created: 5/19/2024
Status: ✅ Merged
Merged: 5/19/2024
Merged by: @dscyrescotti
Base:
main← Head:feature/pen-tool📝 Commits (10+)
3204328feat: redesign pen tool dock4701eacfeat: add pen tool persistence821b34efeat: add reordering and deleting4bf603afeat: add vertex generator in eraser render pass682fbbdfeat: scroll to new added pen5a9b9d6feat: add duplicate and remove button5d38f33feat: add scroll transitionce3a021feat: update pen dock layout0c03abefeat: add color picker23ce307feat: add tiny border to color preview📊 Changes
51 files changed (+1137 additions, -188 deletions)
View changed files
📝
Memola.xcodeproj/project.pbxproj(+118 -17)📝
Memola/Canvas/Contexts/GraphicContext.swift(+1 -1)📝
Memola/Canvas/RenderPasses/EraserRenderPass.swift(+30 -0)➕
Memola/Canvas/Tool/Core/Tool.swift(+109 -0)📝
Memola/Canvas/Tool/Pen/Core/Pen.swift(+38 -20)📝
Memola/Canvas/Tool/Pen/Core/PenStyle.swift(+13 -1)📝
Memola/Canvas/Tool/Pen/PenStyles/EraserPenStyle.swift(+3 -1)📝
Memola/Canvas/Tool/Pen/PenStyles/MarkerPenStyle.swift(+3 -1)➖
Memola/Canvas/Tool/Tool.swift(+0 -27)📝
Memola/Canvas/View/Bridge/ViewController/CanvasViewController.swift(+1 -0)📝
Memola/Canvas/View/Canvas/CanvasView.swift(+0 -0)➕
Memola/Components/ViewModifiers/ContextMenuViewModifier.swift(+30 -0)➕
Memola/Components/ViewModifiers/OnDragViewModifier.swift(+30 -0)➕
Memola/Components/Views/ColorPicker/ColorPicker.swift(+196 -0)➕
Memola/Config/Info.plist(+51 -0)📝
Memola/Extensions/Color++.swift(+12 -0)📝
Memola/Features/Memo/Memo/MemoView.swift(+12 -13)➕
Memola/Features/Memo/PenDock/PenDockView.swift(+297 -0)➕
Memola/Features/Memo/PenDock/PenDropDelegate.swift(+40 -0)➖
Memola/Features/Memo/PenToolView.swift(+0 -82)...and 31 more files
📄 Description
Description
This PR redesign the pen tool of canvas view along with the addition of color picker and stroke thickness picker.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.