mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'video_panning_option' into feature

Browse source
This commit is contained in:
arch1t3cht 2022-08-23 04:51:41 +02:00
commit 2e78b9cfde
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/video_display.cpp
View file

@ -323,7 +323,9 @@ void VideoDisplay::UpdateSize() {
if (!provider || !IsShownOnScreen()) return;
videoSize.Set(provider->GetWidth(), provider->GetHeight());
videoSize *= videoZoomValue * windowZoomValue;
videoSize *= windowZoomValue;
if (con->videoController->GetAspectRatioType() != AspectRatio::Default)
videoSize.SetWidth(videoSize.GetHeight() * con->videoController->GetAspectRatioValue());
wxEventBlocker blocker(this);
if (freeSize) {
@ -338,12 +340,12 @@ void VideoDisplay::UpdateSize() {
SetClientSize(oldClientSize + (top->GetSize() - oldSize));
}
else {
wxSize newSize = wxSize(provider->GetWidth(), provider->GetHeight()) * windowZoomValue / scale_factor;
SetMinClientSize(newSize);
SetMaxClientSize(newSize);
SetMinClientSize(videoSize / scale_factor);
SetMaxClientSize(videoSize / scale_factor);
GetGrandParent()->Layout();
}
videoSize *= videoZoomValue;
PositionVideo();
}
@ -477,7 +479,10 @@ void VideoDisplay::SetVideoZoom(int step) {
int pixelChangeW = std::lround(videoSize.GetWidth() * (newVideoZoom / videoZoomValue - 1.0));
int pixelChangeH = std::lround(videoSize.GetHeight() * (newVideoZoom / videoZoomValue - 1.0));
pan_x -= pixelChangeW * (mp.X() / videoSize.GetWidth());
AsyncVideoProvider *provider = con->project->VideoProvider();
double arfactor = (double) provider->GetHeight() * (double) videoSize.GetWidth() / (double) provider->GetWidth() / (double) videoSize.GetHeight();
pan_x -= pixelChangeW * (mp.X() / videoSize.GetWidth() * arfactor);
pan_y -= pixelChangeH * (mp.Y() / videoSize.GetHeight());
videoZoomValue = newVideoZoom;