Skip to content
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

SCALE_NONE was incorrectly sizing SVG, Image, and Video files. #713

Merged
merged 2 commits into from
Aug 12, 2021

Conversation

jonoomph
Copy link
Member

Since OpenShot changes the preview window size during editing, the SCALE_NONE clips should always be scaled to the ratio: preview width / timeline width... so they stay relative sized to the timeline size.

For example, if an SVG is 500px wide, and the project is 1000px wide... the SVG in SCALE_NONE mode should always be 50% with width of the video, regardless of how small you make the preview window.

…OpenShot changes the preview window size during editing, the SCALE_NONE clips should always be scaled to the ratio: preview / timeline... so they stay relative sized to the timeline size.

For example, if an SVG is 500px wide, and the project is 1000px wide... the SVG in SCALE_NONE mode should always be 50% with width of the video, regardless of how small you make the preview window.
@jonoomph
Copy link
Member Author

Looks like I have some unit test failures... oops

@codecov
Copy link

codecov bot commented Aug 11, 2021

Codecov Report

Merging #713 (7af95c2) into develop (7e419b9) will increase coverage by 0.11%.
The diff coverage is 55.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #713      +/-   ##
===========================================
+ Coverage    46.24%   46.36%   +0.11%     
===========================================
  Files          182      182              
  Lines        16701    16760      +59     
===========================================
+ Hits          7724     7770      +46     
- Misses        8977     8990      +13     
Impacted Files Coverage Δ
src/Clip.cpp 44.17% <ø> (+0.16%) ⬆️
src/FFmpegReader.cpp 68.04% <0.00%> (-0.38%) ⬇️
src/QtImageReader.h 66.66% <ø> (ø)
src/QtImageReader.cpp 71.81% <66.66%> (-2.81%) ⬇️
tests/QtImageReader.cpp 100.00% <100.00%> (ø)
src/FrameMapper.cpp 92.54% <0.00%> (+0.41%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7e419b9...7af95c2. Read the comment docs.

@jonoomph jonoomph requested a review from JacksonRG August 11, 2021 21:41
src/QtImageReader.cpp Show resolved Hide resolved
src/QtImageReader.cpp Show resolved Hide resolved
@JacksonRG
Copy link
Collaborator

LGTM!

@jonoomph jonoomph merged commit 91aaf18 into develop Aug 12, 2021
@jonoomph jonoomph deleted the fix-scale-none-scaling branch August 12, 2021 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants