Skip to content

Backend and Frontend modification to show working color mods #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Jun 12, 2021
Merged

Backend and Frontend modification to show working color mods #180

merged 4 commits into from
Jun 12, 2021

Conversation

akshay1992kalbhor
Copy link
Contributor

@akshay1992kalbhor akshay1992kalbhor commented Jun 12, 2021 •
edited by Keavon
Loading

This change is Reviewable

TrueDoctor
TrueDoctor reviewed Jun 12, 2021
View reviewed changes
Copy link
Member

@TrueDoctor TrueDoctor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed the shift x keybind conflicts with the layer deletion, could you quickly fix that?
To resolve the issue you just have to change the precedence in editor/src/input/input_mapper.rs to look like this:

	// Tool Actions
			entry! {action=ToolMessage::SelectTool(ToolType::Rectangle), key_down=KeyM},
			entry! {action=ToolMessage::SelectTool(ToolType::Ellipse), key_down=KeyE},
			entry! {action=ToolMessage::SelectTool(ToolType::Select), key_down=KeyV},
			entry! {action=ToolMessage::SelectTool(ToolType::Line), key_down=KeyL},
			entry! {action=ToolMessage::SelectTool(ToolType::Pen), key_down=KeyP},
			entry! {action=ToolMessage::SelectTool(ToolType::Shape), key_down=KeyY},
			entry! {action=ToolMessage::SwapColors, key_down=KeyX, modifiers=[KeyShift]},
			// Document Actions
			entry! {action=DocumentMessage::Undo, key_down=KeyZ, modifiers=[KeyControl]},
			entry! {action=DocumentMessage::DeleteSelectedLayers, key_down=KeyDelete},
			entry! {action=DocumentMessage::DeleteSelectedLayers, key_down=KeyX},
			entry! {action=DocumentMessage::DeleteSelectedLayers, key_down=KeyBackspace},
			entry! {action=DocumentMessage::ExportDocument, key_down=KeyS, modifiers=[KeyControl, KeyShift]},
			entry! {action=DocumentMessage::ExportDocument, key_down=KeyE, modifiers=[KeyControl]},

TrueDoctor
TrueDoctor approved these changes Jun 12, 2021
View reviewed changes
Copy link
Member

@TrueDoctor TrueDoctor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything looks good so far, not sure if we can do something fancier then just directly modifying the dom, but the Rust side is all good

@akshay1992kalbhor
Copy link
Contributor Author

Ok. I am on standby if @Keavon wants anything changed.

Keavon
Keavon reviewed Jun 12, 2021
View reviewed changes
client/web/src/components/widgets/inputs/SwatchPairInput.vue Outdated
Comment on lines 137 to 140
const primaryButton = this.getRef<HTMLButtonElement>("primaryButton");
const secondaryButton = this.getRef<HTMLButtonElement>("secondaryButton");
primaryButton.style.setProperty("--swatch-color", `rgba(${primary.red}, ${primary.green}, ${primary.blue}, ${primary.alpha})`);
secondaryButton.style.setProperty("--swatch-color", `rgba(${secondary.red}, ${secondary.green}, ${secondary.blue}, ${secondary.alpha})`);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These lines should, instead, just update the values of this.primaryColor and this.secondaryColor. I believe, because those values are watched, they should automatically update the rendered swatches.

@Keavon Keavon merged commit e867f4d into GraphiteEditor:master Jun 12, 2021
@Keavon
Copy link
Member

Keavon commented Jun 12, 2021

Closes #164

@Keavon Keavon mentioned this pull request Jun 12, 2021
Closed
0HyperCube pushed a commit that referenced this pull request Jun 13, 2021
@akshay1992kalbhor @0HyperCube
Frontend fixed to render changes to working colors when changed from …
b737e27 
…backend (#180)

* Backend and Frontend modification to show working color mods

* Remove comments & change precedence for tool and doc actions

* Add keybind for resetting work colors

* Minor Frontend changes
0HyperCube added a commit that referenced this pull request Jun 26, 2021
@0HyperCube @akshay1992kalbhor @Keavon
Add a movable canvas with matricies (#175)
f76517a 
* Convert polygon and rectangle tool to kurbo::BezPath

* Add glam

* Add affine transform to elipse and remove circle

* Format

* Add svg group and add matrix for group

* Convert all operations to use matricies

* Work uses same transform as root

* Format

* Frontend fixed to render changes to working colors when changed from backend (#180)

* Backend and Frontend modification to show working color mods

* Remove comments & change precedence for tool and doc actions

* Add keybind for resetting work colors

* Minor Frontend changes

* Remove early sample "greet" code

* Add a contributing section to the project README

* Add moving document around

* Add document transform for tools

* Update to GraphiteEditor's fork

* Use write in foreach for rendering group / folder

* Add missing TranslateDown action

* Use points for line operation

* Format

* Add todo to change to shape's aspect ratio

* Remove empty if

* Initial pass at refactor

* Fix polyline test

* Use document message to modify document transform

* Messages -> Operations

* Transform layer

* Format

* Use DAffine2::IDENTITY

* Clean up kurbo generation for line and rect

* Use .into for rectangle points

* Rename cols to transform

* Rename other cols to transform

* Add todo for into_iter

* Remove unnecessary clone

Co-authored-by: akshay1992kalbhor <[email protected]>
Co-authored-by: Keavon Chambers <[email protected]>
Keavon added a commit that referenced this pull request Jun 16, 2022
@0HyperCube @akshay1992kalbhor @Keavon
Add a movable canvas with matricies (#175)
3b5cc53 
* Convert polygon and rectangle tool to kurbo::BezPath

* Add glam

* Add affine transform to elipse and remove circle

* Format

* Add svg group and add matrix for group

* Convert all operations to use matricies

* Work uses same transform as root

* Format

* Frontend fixed to render changes to working colors when changed from backend (#180)

* Backend and Frontend modification to show working color mods

* Remove comments & change precedence for tool and doc actions

* Add keybind for resetting work colors

* Minor Frontend changes

* Remove early sample "greet" code

* Add a contributing section to the project README

* Add moving document around

* Add document transform for tools

* Update to GraphiteEditor's fork

* Use write in foreach for rendering group / folder

* Add missing TranslateDown action

* Use points for line operation

* Format

* Add todo to change to shape's aspect ratio

* Remove empty if

* Initial pass at refactor

* Fix polyline test

* Use document message to modify document transform

* Messages -> Operations

* Transform layer

* Format

* Use DAffine2::IDENTITY

* Clean up kurbo generation for line and rect

* Use .into for rectangle points

* Rename cols to transform

* Rename other cols to transform

* Add todo for into_iter

* Remove unnecessary clone

Co-authored-by: akshay1992kalbhor <[email protected]>
Co-authored-by: Keavon Chambers <[email protected]>
Keavon pushed a commit that referenced this pull request Jul 30, 2023
@akshay1992kalbhor @Keavon
Frontend fixed to render changes to working colors when changed from …
3079223 
…backend (#180)

* Backend and Frontend modification to show working color mods

* Remove comments & change precedence for tool and doc actions

* Add keybind for resetting work colors

* Minor Frontend changes
Keavon added a commit that referenced this pull request Jul 30, 2023
@0HyperCube @akshay1992kalbhor @Keavon
Add a movable canvas with matricies (#175)
bb3293a 
* Convert polygon and rectangle tool to kurbo::BezPath

* Add glam

* Add affine transform to elipse and remove circle

* Format

* Add svg group and add matrix for group

* Convert all operations to use matricies

* Work uses same transform as root

* Format

* Frontend fixed to render changes to working colors when changed from backend (#180)

* Backend and Frontend modification to show working color mods

* Remove comments & change precedence for tool and doc actions

* Add keybind for resetting work colors

* Minor Frontend changes

* Remove early sample "greet" code

* Add a contributing section to the project README

* Add moving document around

* Add document transform for tools

* Update to GraphiteEditor's fork

* Use write in foreach for rendering group / folder

* Add missing TranslateDown action

* Use points for line operation

* Format

* Add todo to change to shape's aspect ratio

* Remove empty if

* Initial pass at refactor

* Fix polyline test

* Use document message to modify document transform

* Messages -> Operations

* Transform layer

* Format

* Use DAffine2::IDENTITY

* Clean up kurbo generation for line and rect

* Use .into for rectangle points

* Rename cols to transform

* Rename other cols to transform

* Add todo for into_iter

* Remove unnecessary clone

Co-authored-by: akshay1992kalbhor <[email protected]>
Co-authored-by: Keavon Chambers <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Keavon Keavon Keavon approved these changes

@TrueDoctor TrueDoctor TrueDoctor approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@akshay1992kalbhor @Keavon @TrueDoctor