* Fix firefox text input
* Fix descenders below bounding box
* Fix chromium empty text
* Descenders back below baseline
* Fix trailing newline on chromium
* Reinstate correct baseline height
* Fix highlighted new line on empty text
* Add comment for trailing new line removal
* Extract cleanupTextInput to a separate file
* Function import simplification
Co-authored-by: Keavon Chambers <keavon@keavon.com>
* Add text tool
* Double click with the select tool to edit text
* Fix (I think?) transitioning to select tool
* Commit and abort text editing
* Transition to a contenteditable div and autosize
* Fix right click blocking
* Cleanup hints
* Ctrl + enter leaves text edit mode
* Render indervidual bounding boxes for text
* Re-format space indents
* Reflect font size in the textarea
* Fix change tool behaviour
* Remove starting text
* Populate the cache (caused doc load bug)
* Remove console log
* Chrome display the flashing text entry cursor
* Update overlay on input
* Cleanup input.ts
* Fix bounding boxes
* Apply review feedback
* Remove manual test
* Remove svg from gitignore
Co-authored-by: Keavon Chambers <keavon@keavon.com>
* Modify all message enum data to use named struct values, not tuples (#479)
* Massively reorganize and clean up the whole Rust codebase
* Modify all message enum data to use named struct values, not tuples
* Do not transform layers when transforming parent
* Reduce complexity to O(nlogn)
* Add TODO comment about performance
Co-authored-by: Keavon Chambers <keavon@keavon.com>
Co-authored-by: Dennis <dennis@kobert.dev>
* #82 path-tool: WIP selecting control point working
* Fix bug where duplication with Ctrl+D doesn't properly duplicate (#423)
* bug fix: duplication didn't properly duplicate
* cargo fmt
* changed the formatting slightly for readability
* Small cleanups, changed color of handles upon selection
* Fix changes from merge
* Remove duplicate anchor points on top of one another
* Fix possible issues with thumbnails not being updated from Graphene operations
* path-tool: attempt to move control points on click
* Add dragging for control points
* Editing shape anchors functional. Handles next.
* Comment cleanup & slight cleanup of closest_anchor(..)
* Removing conflict with master
* Tiny code tweaks
Co-authored-by: Keavon Chambers <keavon@keavon.com>
Co-authored-by: caleb <56044292+caleb-ad@users.noreply.github.com>
Co-authored-by: otdavies <oliver@psyfer.io>
Co-authored-by: Dennis <dennis@kobert.dev>
* WIP handling corner cases, like ungrouping subfolders
* Resolved hanging
* Fix recursive ungrouping
* Functional, corner case free Ungroup. Small Undo issue & warnings
* Update layertree upon undo
* Also update layerdata upon redo
* Add some polish
* Resolved TODOs
* Oops didn't save all after rename, ha.
Co-authored-by: Dennis <dennis@kobert.dev>
* WIP fix of folder crash / indent
* Fixed most crashes
* Known cases of crash / incorrect behavior resolved
* Removed todo & readability tweak
* Removed left over test
* Resolved clippy issue resulting from merging master
* Replace recursive tree traversal with prefix matching
* Reverted changes for #453 and added undo functionality to Paste
* Make uuid generator thread local for tests
* Maintain layer order, test still failing 50% of the time
* Reverting back to known working with the knowledge we can optimize later.
This reverts commit 1aaf5c0d7dbe67cd9f4ba8b536a4771a2cef6439.
* Revert "Make uuid generator thread local for tests"
This reverts commit d68e3b9c4ebf639c4b2ecae43f5ad3d060dcb12b.
* Revert "Reverted changes for #453 and added undo functionality to Paste"
This reverts commit d66992ac9440f244d461a6a815ae2a08eede47d7.
* Revert "Replace recursive tree traversal with prefix matching"
This reverts commit 6bcbb9f82f62b1f9aa00287110fbce64e1d2f0db.
* Reverted to working state and added comment back to optimized commit hash
* Re-removed the changes involving #453
Co-authored-by: Dennis <dennis@kobert.dev>
* New overlay system that reimplements how overlays are drawn
* Fix overlay message declaration
* Fix small mistake
* WIP (broken) changes to plumb the overlay document
* Fix confusion over messaging system architecture
* Removed log
* Overlay system working
* (broken) WIP overlay association
* Finish the overlay system (except test failure)
* Change back IDs in test
* Fixed test, but stilled fails due to revealed real problem with layer reordering selection
* Disable broken test that has a bug in issue #444
Co-authored-by: Dennis <dennis@kobert.dev>
Co-authored-by: otdavies <oliver@psyfer.io>
* Populate layer entry cache
* Serialize the DocumentMessageHandler
* Fix restoring of collapsed/expanded state, add iter impl for Layer, and clean up layer_data() functions
* Fixed bug with CreateEmptyLayer revealed by test
Co-authored-by: Keavon Chambers <keavon@keavon.com>
Co-authored-by: otdavies <oliver@psyfer.io>
* removed all use of document indicies
* -add u64 support for wasm bridge
* fixed rust formating
* Cleaned up FrontendDocumentState in js-messages
* Tiny tweaks from code review
* - moved more of closeDocumentWithConfirmation to rust
- updated serde_wasm_bindgen to add feature flag
* working initial auto save impl
* auto save is a lifetime file
* - cargo fmt
- fixc error message
- move document version constant
* code review round 1
* generate seed for uuid in js when wasm is initialized
* Resolve PR feedback
* Further address PR feedback
* Fix failing test
Co-authored-by: Keavon Chambers <keavon@keavon.com>
Co-authored-by: otdavies <oliver@psyfer.io>
* Created wasm binding to action's of the radio buttons which control the view mode
Added entry to DocumentMessage Enum
* draw in wireframe mode by changing parameters on each shape
added functions/changed behavior to do as above
not working yet
- newly added shapes should be drawn in wireframe
- setting fill to "none" on a path does not only draw an outline
- maybe the stroke width is 0?
* Wire frame view mostly functional for ellipses
- Need to implement for all shapes
- BUG: shapes don't immediatley update upon changing view-mode
* Fixed: active document now updates after view mode swap
* The Pros:
- wire frame mode effects all shapes correctly
The Cons:
- wire frame mode effects everything, including things that maybe shouldn't be, like select boxes and pen lines
* wire frame view no longer effects overlay layers
* Fixed: While in wireframe view the pen tool will draw regular thickness lines.
* some commenting
* Fixed potential bug:
In layer/file system with a Folder layer with a sub-layer that is also
a Folder cache_dirty must be set in order for all shapes to update properly
* refactored code to use ViewMode enum names throughout
* Changed: All wireframe lines are blank
cargo fmt
* Wireframe thickness doesn't change as a result of zooming
- Added DocumentMessage::ReRenderDocument, which marks layers as dirty and renders with the updated render-string
- All "zoom" messages in the movement_handler send a re-render message
- while in wireframe view, the "render-transform" of all shapes includes the root layer transform
Added getter/setter methods for graphene::Document::view_mode
* cargo fmt
* wireframe now has proper thickness after "Zoom Canvas to Fit all" action
* Refactored
- Changed FrontendMessage::UpdateCanvas to RenderDocument message to allow for lazy evaluation
- Created DocumentOperation::SetViewMode to be more consistent with existing code
- removed log statement
- Added constants for empty fill and thin-black stroke
* cargo fmt
* Removed ReRenderDocument message
* cargo fmt
* Fixes as suggested by TrueDoctor
* clean up merge
cargo fmt
* Refactor:
moved view_mode to DocumentMessageHandler
* Polishing
* changed those two comments
* Remove unknown todo comment
Co-authored-by: Keavon Chambers <keavon@keavon.com>
* Add vue selectLayer(layer, ctrl, shift)
* Individual selection working, range fill next
* Frontend package-lock.json seems apparently needs to be pushed. Weird.
* Selection working with ctrl, shift from editor. Still some bugs to sqaush with folder nesting.
* WIP resolving nesting folders issues
* Changed comparison approach, handling corner cases now
* Fully working selection.
* Reverted changes to package-lock.json
* Removed unused code
* Resolved ctrl click not behaving similar to windows
* Slight comment clarification
* Double checked a windows behavior and corrected. Changed last_selected name.
* Simplified if statement slightly.
* Made the naming clearer regarding UUIDs versus indices
* Clarified comments further
* Minor comment fixup
* Implemented suggestions, clarified comments
* Resolved todo regarding clearing selection when ctrl not pressed
* Ensure we only push responses when needed
Co-authored-by: Keavon Chambers <keavon@keavon.com>
Reviewed by: @TrueDoctor <3
* ability to mark an open document as unsaved
* unsaved detection now being triggered based on layer tree height
* - rust implementation of unsaved markers
- upgraded eslint
* updated eslint in package.json
* - Renamed GetOpenDocumentsList -> UpdateOpenDocumentsList
- is not -> was not
* changed hash to current identifier to better reflect its meaning
* resolve some merge conflicts
* removed console.log statement leftover from debuging
* 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
* Hook up layer tree structure with frontend (decoding and Vue are WIP)
* Fix off by one error
* Avoid leaking memory
* Parse layer structure into list of layers
* Fix thumbnail updates
* Correctly popagate deletions
* Fix selection state in layer tree
* Respect expansion during root serialization
* Allow expanding of subfolders
* Fix arrow direction
Co-authored-by: Dennis Kobert <dennis@kobert.dev>
* Add folders to frontend and folder creation to backend
Closes#149
* Add Group keybind
* Add logic to handle expanding of folders
* Send all paths as (u32, u32)
* Add custom serialization for path
* Merge two layer_panel files
* Refactor frontend layer merging
* Fix JS linting
* Update upstream thumbnail changes
* Add paste into selected folder + fix thumbnail dirtification
* Implement CollapseFolder function
* Skip folders on a different indentation level during reorder
* Only reorder within the same folder
* Add folder node icon for folder layers
* Add expand/collapse folder button; partly implement new layer tree design
* Update terminology in the docs
* Add number labels to ruler marks
* Replace promise with await in MenuList.vue
* Miscellaneous minor code cleanup
* Disallow snake_case variable names in frontend
* Add support for saving and opening files (#325)
* Add support for saving a document
This is similar to the "export" functionality, except that
we store all metadata needed to open the file again.
Currently we store the internal representation of the layer
which is probably pretty fragile.
* Add support for opening a saved document
User can select a file using the browser's file input selector.
We parse it as JSON and load it into the internal representation.
Concerns:
- The file format is fragile
- Loading data directly into internal data structures usually creates
security vulnerabilities
- Error handling: The user is not informed of errors
* Serialize Document and skip "cache" fields in Layer
Instead of serializing the root layer, we serialize the
Document struct directly. Additionally, we mark the
"cache" fields in layer as "skip" fields so they
don't get serialized.
* Opened files use the filename as the tab title
* Split "new document" and "open document" handling
Open document needs name and content to be provided so having a
different interface is cleaner. Also did some refactoring to reuse code.
* Show error to user when a file fails to open
* Clean up code: better variable naming and structure
* Use document name for saved and exported files
We pass through the document name in the export and save
messages. Additionally, we check if the appropriate file
suffixes (.graphite and .svg) need to be added before
passing it to the frontend.
* Refactor document name generation
* Don't assign a default of 1 to Documents that start with something
other than DEFAULT_DOCUMENT_NAME
* Improve runtime complexity by using binary instead of linear search
* Update Layer panel upon document selection
* Add File>Open/Ctrl+O; File>Save (As)/Ctrl+(Shift)+S; browse filters extension; split out download()/upload() into files.ts; change unsaved close dialog text
Co-authored-by: Dennis Kobert <dennis@kobert.dev>
Co-authored-by: Keavon Chambers <keavon@keavon.com>
* Refactor ViewportPosition from u32 (UVec2) to f64 (DVec2) (#345)
* Refactor ViewportPosition from u32 (UVec2) to f64 (DVec2)
* Fix pseudo_hash call
* Replace hash function with proper function for uuid generation
* Cargo fmt
Co-authored-by: Dennis Kobert <dennis@kobert.dev>
* Improve Frontend -> Backend user input system (#348)
Includes refactor that sends coordinates of the document viewports to the backend so input is sent relative to the application window
Closes#124Fixes#291
* Improve Frontend -> Backend user input system
* Code review changes
* More code review changes
* Fix TS error
* Update the readme
* Make scrollbars interactable (#328)
* Make scrollbars interactable
* Add watcher for position change
* Fix case of data
* Fix updateHandlePosition capitalization
* Clean up class name thing
* Scroll bars between 0 and 1
* Allow width to be 100%
* Scrollbars reflect backend
* Include viewport in scrollbar
* Add half viewport padding for scrollbars
* Refactor scrollbar using lerp
* Send messages to backend
* Refactor
* Use glam::DVec2
* Remove glam::
* Remove unnecessary abs
* Add TrueDoctor's change
* Add missing minus
* Fix vue issues
* Fix viewport size
* Remove unnecessary log
* Linear dragging
* Improve scrollbar behavior (#351)
* Change scrollbar behavior
* Leave space at the end of the scrollbar
* Change mid to center
* Use shorter array initialization
* Add space around scrollbar
* Fix scrollbar spacing
* Smooth end of scrollbars
* Add page up and down
* Page up and down on click in scrollbar track
* Add shift pageup to translate horizontally
* Implement bounding box for selected layers (#349)
* Implement bounding box for selected layers
* Add shift modifier for multi selection
* Fix collapsing of folders
* Add have pixel offset to selection bounding box
* Don't panic on Ctrl + A
* Rename to camel case
* Add todo comment for Keavon
* Apply @Hypercubes review suggestions
* Fix many panics, improve behavior of copy/paste and grouping (but grouping still can panic)
Co-authored-by: Dennis Kobert <dennis@kobert.dev>
* Implement Path Tool
* Draw a red rectangle where the first point on the shape is
* Correctly render anchors, handles, and connecting lines
* Fix drain() which can panic
* Refactor frontend messages to work as return values not callbacks
* Reduce the number of unnecessary frontend updates
* Fix stack overflow by using a loop
* Group Document Render calls and put them at the end
* Speed hacks for dirtification
* Add performance
* Bunch folder changed updates
* Add triggers to redraw overlays to movement_handler
* Polish the pixel-perfect rendering of vector manipulators
* Restore scrollbars that were disabled
* Cleanup
* WIP Add shape outline rendering
* Fix compiling
* Add outlines to selected shapes
* Fix outlines rendering over handles and anchors
* Fix dirtification
* Add a comment
* Address code review feedback
* Formatting
* Small tweaks
Co-authored-by: Oliver Davies <oliver@psyfer.io>
Co-authored-by: Dennis Kobert <dennis@kobert.dev>
* Implement undo and redo
* Create more save points and hook up menu entry
* Fix operation ordering
* Remove debug statement
* Fix folder changed order
* Don't store overlays in the history chain
* Keep selection
* Add support for saving a document
This is similar to the "export" functionality, except that
we store all metadata needed to open the file again.
Currently we store the internal representation of the layer
which is probably pretty fragile.
Example document:
```json
{
"nodes": {},
"root": {
"blend_mode": "Normal",
"cache": "...",
"cache_dirty": false,
"data": {
"Folder": {
"layer_ids": [
3902938778642561358
],
"layers": [
{
"blend_mode": "Normal",
"cache": "...",
"cache_dirty": false,
"data": {
"Shape": {
"path": [
{
"MoveTo": {
"x": 0.0,
"y": 0.0
}
},
{
"LineTo": {
"x": 1.0,
"y": 0.0
}
},
{
"LineTo": {
"x": 1.0,
"y": 1.0
}
},
{
"LineTo": {
"x": 0.0,
"y": 1.0
}
},
"ClosePath"
],
"render_index": 1,
"solid": true,
"style": {
"fill": {
"color": {
"alpha": 1.0,
"blue": 0.0,
"green": 0.0,
"red": 0.0
}
},
"stroke": null
}
}
},
"name": null,
"opacity": 1.0,
"thumbnail_cache": "...",
"transform": {
"matrix2": [
223.0,
0.0,
-0.0,
348.0
],
"translation": [
-188.0,
-334.0
]
},
"visible": true
}
],
"next_assignment_id": 3902938778642561359
}
},
"name": null,
"opacity": 1.0,
"thumbnail_cache": "...",
"transform": {
"matrix2": [
1.0,
0.0,
0.0,
1.0
],
"translation": [
479.0,
563.0
]
},
"visible": true
},
"version": 0
}
```
* Add support for opening a saved document
User can select a file using the browser's file input selector.
We parse it as JSON and load it into the internal representation.
Concerns:
- The file format is fragile
- Loading data directly into internal data structures usually creates
security vulnerabilities
- Error handling: The user is not informed of errors
* Serialize Document and skip "cache" fields in Layer
Instead of serializing the root layer, we serialize the
Document struct directly. Additionally, we mark the
"cache" fields in layer as "skip" fields so they
don't get serialized.
* Opened files use the filename as the tab title
* Split "new document" and "open document" handling
Open document needs name and content to be provided so having a
different interface is cleaner. Also did some refactoring to reuse code.
* Show error to user when a file fails to open
* Clean up code: better variable naming and structure
* Use document name for saved and exported files
We pass through the document name in the export and save
messages. Additionally, we check if the appropriate file
suffixes (.graphite and .svg) need to be added before
passing it to the frontend.
* Refactor document name generation
* Don't assign a default of 1 to Documents that start with something
other than DEFAULT_DOCUMENT_NAME
* Improve runtime complexity by using binary instead of linear search
* Update Layer panel upon document selection
* Add File>Open/Ctrl+O; File>Save (As)/Ctrl+(Shift)+S; browse filters extension; split out download()/upload() into files.ts; change unsaved close dialog text
Co-authored-by: Dennis Kobert <dennis@kobert.dev>
Co-authored-by: Keavon Chambers <keavon@keavon.com>