Fix the issue that the imageScaleModes is not effective with editable image#2684
Merged
domchen merged 6 commits intoTencent:mainfrom Feb 19, 2025
Merged
Fix the issue that the imageScaleModes is not effective with editable image#2684domchen merged 6 commits intoTencent:mainfrom
domchen merged 6 commits intoTencent:mainfrom
Conversation
domchen
reviewed
Feb 19, 2025
Comment on lines
+30
to
+48
| auto file = pagFile->getFile(); | ||
| if (file && file->imageScaleModes && !file->imageScaleModes->empty()) { | ||
| auto editableImages = pagFile->getEditableIndices(LayerType::Image); | ||
| for (size_t i = 0; i < editableImages.size(); i++) { | ||
| bool found = false; | ||
| auto imageLayers = file->getImageAt(editableImages.at(i)); | ||
| for (size_t j = 0; j < imageLayers.size(); j++) { | ||
| auto tmpImageLayer = imageLayers.at(j); | ||
| if (imageLayer == tmpImageLayer) { | ||
| defaultScaleMode = file->imageScaleModes->at(i); | ||
| found = true; | ||
| break; | ||
| } | ||
| } | ||
| if (found) { | ||
| break; | ||
| } | ||
| } | ||
| } |
Collaborator
There was a problem hiding this comment.
不用这么复杂。imageLayer本身就有editableIndex, 用来作为imageScaleModes的索引就行了。
Collaborator
Author
There was a problem hiding this comment.
imageLayer的类型是pag::ImageLayer，应该没有editableIndex属性吧；类型pag::PAGLayer(pag::PAGImageLayer的父类)倒是有editableIndex属性
domchen
reviewed
Feb 19, 2025
| delete replacement; | ||
| if (image != nullptr) { | ||
| replacement = new ImageReplacement(static_cast<ImageLayer*>(layer), image); | ||
| replacement = new ImageReplacement(rootFile, static_cast<ImageLayer*>(layer), image); |
Collaborator
There was a problem hiding this comment.
不用传递rootFile， imageLayer->getFile()就行。
Collaborator
Author
There was a problem hiding this comment.
imageLayer好像没有getFile这个方法
…ponding to imageLayer
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2684 +/- ##
==========================================
- Coverage 77.30% 77.25% -0.06%
==========================================
Files 425 425
Lines 22461 22467 +6
Branches 6356 6357 +1
==========================================
- Hits 17364 17357 -7
- Misses 3805 3813 +8
- Partials 1292 1297 +5 ☔ View full report in Codecov by Sentry. |
…ponding to imageLayer
domchen
reviewed
Feb 19, 2025
Comment on lines
+681
to
+691
| int defaultScaleMode = PAGScaleMode::LetterBox; | ||
| int index = editableIndex(); | ||
| if (index >= 0 && file && file->imageScaleModes && !file->imageScaleModes->empty()) { | ||
| defaultScaleMode = file->imageScaleModes->at(index); | ||
| } | ||
| auto imageLayer = static_cast<ImageLayer*>(layer); | ||
| if (imageLayer && imageLayer->imageFillRule) { | ||
| defaultScaleMode = imageLayer->imageFillRule->scaleMode; | ||
| } | ||
|
|
||
| return defaultScaleMode; |
Collaborator
There was a problem hiding this comment.
要避免重复计算，应该是最先判断ImageFillRule上的scaleMode，如果存在就直接return。然后再判断editableIndex，return。最后return letterbox。if-return 这是推荐的代码写法。逻辑更清晰，代码执行也没有重复。
domchen
reviewed
Feb 19, 2025
| defaultScaleMode = imageFillRule ? imageFillRule->scaleMode : PAGScaleMode::LetterBox; | ||
| contentWidth = imageLayer->imageBytes->width; | ||
| contentHeight = imageLayer->imageBytes->height; | ||
| defaultScaleMode = scaleMode; |
Collaborator
There was a problem hiding this comment.
这几个参数已经不需要判断或者计算了，可以直接在构造函数初始化的地方赋值。类似pagImage(std::move(pagImage))，defaultScaleMode(scale), contentWidth...
domchen
reviewed
Feb 19, 2025
|
|
||
| namespace pag { | ||
| ImageReplacement::ImageReplacement(ImageLayer* imageLayer, std::shared_ptr<PAGImage> pagImage) | ||
| ImageReplacement::ImageReplacement(int scaleMode, ImageBytes* bytes, |
Collaborator
There was a problem hiding this comment.
ImageBytes* bytes 改成：ImageBytes* imageBytes， 避免含义误解。另外参数列表顺序调整一下，PAGImage调整到第一个。
…ponding to imageLayer
…ponding to imageLayer
domchen
approved these changes
Feb 19, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 the issue that the imageScaleModes is not effective with editable image