Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions src/rendering/editing/ImageReplacement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,35 @@
#include "rendering/graphics/Recorder.h"

namespace pag {
ImageReplacement::ImageReplacement(ImageLayer* imageLayer, std::shared_ptr<PAGImage> pagImage)
ImageReplacement::ImageReplacement(PAGFile* pagFile, ImageLayer* imageLayer,
std::shared_ptr<PAGImage> pagImage)
: pagImage(std::move(pagImage)) {
defaultScaleMode = PAGScaleMode::LetterBox;
if (pagFile) {
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;
}
}
}
Copy link
Collaborator

Choose a reason for hiding this comment

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

不用这么复杂。imageLayer本身就有editableIndex, 用来作为imageScaleModes的索引就行了。

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Clipboard_Screenshot_1739933491 imageLayer的类型是pag::ImageLayer,应该没有editableIndex属性吧;类型pag::PAGLayer(pag::PAGImageLayer的父类)倒是有editableIndex属性

}
auto imageFillRule = imageLayer->imageFillRule;
defaultScaleMode = imageFillRule ? imageFillRule->scaleMode : PAGScaleMode::LetterBox;
if (imageFillRule) {
defaultScaleMode = imageFillRule->scaleMode;
}
contentWidth = imageLayer->imageBytes->width;
contentHeight = imageLayer->imageBytes->height;
}
Expand Down
2 changes: 1 addition & 1 deletion src/rendering/editing/ImageReplacement.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
namespace pag {
class ImageReplacement : public Content {
public:
ImageReplacement(ImageLayer* imageLayer, std::shared_ptr<PAGImage> pagImage);
ImageReplacement(PAGFile* pagFile, ImageLayer* imageLayer, std::shared_ptr<PAGImage> pagImage);

void measureBounds(tgfx::Rect* bounds) override;
void draw(Recorder* recorder) override;
Expand Down
2 changes: 1 addition & 1 deletion src/rendering/layers/PAGImageLayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Collaborator

Choose a reason for hiding this comment

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

不用传递rootFile, imageLayer->getFile()就行。

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

imageLayer好像没有getFile这个方法

} else {
replacement = nullptr;
}
Expand Down
Loading