Integrate selected colors service #310
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tController - update selectedColorsService getColors array API to explicit getPrimary/getSecondary - update drawing test helper as well
…tController - update selectedColorsService getColors array API to explicit getPrimary/getSecondary - update drawing test helper as well
… into Integrate-SelectedColorsService Conflicts: src/js/controller/DrawingController.js src/js/tools/drawing/DitheringTool.js
| var strokePoints = pskl.PixelUtils.getBoundRectanglePixels(this.startCol, this.startRow, col, row); | ||
| for (var i = 0 ; i < strokePoints.length ; i++) { | ||
| // Change model: | ||
| targetFrame.setPixel(strokePoints[i].col, strokePoints[i].row, color); | ||
| targetFrame.setPixel(strokePoints[i].col, strokePoints[i].row, this.getToolColor()); |
There was a problem hiding this comment.
I think you should use "color" instead of getToolColor().
The logic to swap TRANSPARENT_COLOR for the SELECTION_TRANSPARENT_COLOR is done in the ShapeTool here. It allows to preview your rectangle if you are using the transparent color.
|
Thanks for the refactor ! Good to merge after addressing my comments. |
grosbouddha
added a commit
that referenced
this pull request
Sep 20, 2015
…Service Integrate selected colors service
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The goal of this list of changes is to remove the color arguments from all BaseTool/BaseSelect interfaces and rely on centralized/shared services to provide colors that tools should use.
The color that a tool should use is based on the current primary/secondary colors and if the right/left button of the mouse is used.
SelectedColorsService provides the primary/secondary colors.
The new service MouseStateService provides the mouse button state (and encapsulate properly the mousemove mouse button type bug in FF/IE).
Each tool can use these two services in the getToolColor base method to know which color to use, and the color argument can be removed from the applyToolAt/releaseToolAt/... methods.