-
Notifications
You must be signed in to change notification settings - Fork 511
Fix the issue that the imageScaleModes is not effective with editable image #2684
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
332adb5
Fix the issue that the imageScaleModes is not effective with editable…
CodeJhF 16bd121
Fix some code format problems which prompts by clang-format
CodeJhF c5fd1ac
Simplify the process of obtaining the index of imageScaleModes corres…
CodeJhF 6b431d2
Simplify the process of obtaining the index of imageScaleModes corres…
CodeJhF 77a96a3
Simplify the process of obtaining the index of imageScaleModes corres…
CodeJhF 471ef87
Simplify the process of obtaining the index of imageScaleModes corres…
CodeJhF File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -202,7 +202,7 @@ void PAGImageLayer::setImageInternal(std::shared_ptr<PAGImage> image) { | |
| } | ||
| delete replacement; | ||
| if (image != nullptr) { | ||
| replacement = new ImageReplacement(static_cast<ImageLayer*>(layer), image); | ||
| replacement = new ImageReplacement(rootFile, static_cast<ImageLayer*>(layer), image); | ||
|
||
| } else { | ||
| replacement = nullptr; | ||
| } | ||
|
|
||
Oops, something went wrong.
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.
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.
不用这么复杂。imageLayer本身就有editableIndex, 用来作为imageScaleModes的索引就行了。
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.