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.
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
Show brush preview for custom brushes when using Paint Bucket tool #4060
Merged
dacap
merged 1 commit into
aseprite:main
from
martincapello:fix-brushpreview-for-paintbucket
Sep 26, 2023
Merged
Show brush preview for custom brushes when using Paint Bucket tool #4060
dacap
merged 1 commit into
aseprite:main
from
martincapello:fix-brushpreview-for-paintbucket
Sep 26, 2023
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
martincapello
force-pushed
the
fix-brushpreview-for-paintbucket
branch
from
September 22, 2023 21:16
acb510f
to
a3fed93
Compare
It works great and LGTM. |
Gasparoken
approved these changes
Sep 25, 2023
dacap
reviewed
Sep 25, 2023
src/app/ui/editor/tool_loop_impl.cpp
Outdated
Comment on lines
976
to
981
if (m_tilesMode) | ||
m_pointShape = App::instance()->toolBox()->getPointShapeById(tools::WellKnownPointShapes::Tile); | ||
else if (m_brush->type() == BrushType::kImageBrushType) | ||
m_pointShape = App::instance()->toolBox()->getPointShapeById(tools::WellKnownPointShapes::Brush); | ||
else | ||
m_pointShape = App::instance()->toolBox()->getPointShapeById(tools::WellKnownPointShapes::Pixel); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of calling App::instance()->toolBox()->getPointShapeById()
you can assign the id into a variable and use it as argument in one call site
Suggested change
if (m_tilesMode) | |
m_pointShape = App::instance()->toolBox()->getPointShapeById(tools::WellKnownPointShapes::Tile); | |
else if (m_brush->type() == BrushType::kImageBrushType) | |
m_pointShape = App::instance()->toolBox()->getPointShapeById(tools::WellKnownPointShapes::Brush); | |
else | |
m_pointShape = App::instance()->toolBox()->getPointShapeById(tools::WellKnownPointShapes::Pixel); | |
const char* id; | |
if (m_tilesMode) | |
id = tools::WellKnownPointShapes::Tile; | |
else if (m_brush->type() == BrushType::kImageBrushType) | |
id = tools::WellKnownPointShapes::Brush; | |
else | |
id = tools::WellKnownPointShapes::Pixel; | |
m_pointShape = App::instance()->toolBox()->getPointShapeById(id); |
This is just to avoid writing App::instance()->toolBox()->getPointShapeById
3 times.
martincapello
force-pushed
the
fix-brushpreview-for-paintbucket
branch
from
September 26, 2023 12:18
a3fed93
to
f8edca2
Compare
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.
Fix #4052