Skip to content

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.

Sign up for GitHub

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
domchen merged 6 commits into from
Feb 19, 2025
Merged

Fix the issue that the imageScaleModes is not effective with editable image #2684

Show file tree
Hide file tree
Changes from all 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 Feb 18, 2025
16bd121
Fix some code format problems which prompts by clang-format
CodeJhF Feb 19, 2025
c5fd1ac
Simplify the process of obtaining the index of imageScaleModes corres…
CodeJhF Feb 19, 2025
6b431d2
Simplify the process of obtaining the index of imageScaleModes corres…
CodeJhF Feb 19, 2025
77a96a3
Simplify the process of obtaining the index of imageScaleModes corres…
CodeJhF Feb 19, 2025
471ef87
Simplify the process of obtaining the index of imageScaleModes corres…
CodeJhF Feb 19, 2025
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
1 change: 1 addition & 0 deletions include/pag/pag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,7 @@ class PAG_API PAGImageLayer : public PAGLayer {
Frame getFrameFromTimeRemap(Frame value);
void measureBounds(tgfx::Rect* bounds) override;
int64_t contentDurationInternal();
int getDefaultScaleMode();

friend class RenderCache;

Expand Down
10 changes: 4 additions & 6 deletions src/rendering/editing/ImageReplacement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@
#include "rendering/graphics/Recorder.h"

namespace pag {
ImageReplacement::ImageReplacement(ImageLayer* imageLayer, std::shared_ptr<PAGImage> pagImage)
: pagImage(std::move(pagImage)) {
auto imageFillRule = imageLayer->imageFillRule;
defaultScaleMode = imageFillRule ? imageFillRule->scaleMode : PAGScaleMode::LetterBox;
contentWidth = imageLayer->imageBytes->width;
contentHeight = imageLayer->imageBytes->height;
ImageReplacement::ImageReplacement(std::shared_ptr<PAGImage> pagImage, int scaleMode,
ImageBytes* imageBytes)
: pagImage(std::move(pagImage)), defaultScaleMode(scaleMode), contentWidth(imageBytes->width),
contentHeight(imageBytes->height) {
}

void ImageReplacement::measureBounds(tgfx::Rect* bounds) {
Expand Down
2 changes: 1 addition & 1 deletion src/rendering/editing/ImageReplacement.h
View file
Open in desktop
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(std::shared_ptr<PAGImage> pagImage, int scaleMode, ImageBytes* imageBytes);

void measureBounds(tgfx::Rect* bounds) override;
void draw(Recorder* recorder) override;
Expand Down
16 changes: 15 additions & 1 deletion src/rendering/layers/PAGImageLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ void PAGImageLayer::setImageInternal(std::shared_ptr<PAGImage> image) {
}
delete replacement;
if (image != nullptr) {
replacement = new ImageReplacement(static_cast<ImageLayer*>(layer), image);
replacement = new ImageReplacement(image, getDefaultScaleMode(),
static_cast<ImageLayer*>(layer)->imageBytes);
} else {
replacement = nullptr;
}
Expand Down Expand Up @@ -676,4 +677,17 @@ int64_t PAGImageLayer::contentDurationInternal() {
return FrameToTime(maxFrame + 1, frameRate);
}

int PAGImageLayer::getDefaultScaleMode() {
auto imageLayer = static_cast<ImageLayer*>(layer);
if (imageLayer && imageLayer->imageFillRule) {
return imageLayer->imageFillRule->scaleMode;
}
int index = editableIndex();
if (index >= 0 && file && file->imageScaleModes && !file->imageScaleModes->empty()) {
return file->imageScaleModes->at(index);
}

return PAGScaleMode::LetterBox;
}

} // namespace pag