iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Make zooming center around the cursor position

This commit is contained in:
moex3 2021-04-21 00:21:06 +02:00 committed by Sodra
parent 4f6836da9c
commit db6297c8c3
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/video_display.cpp
View File

@ -299,7 +299,8 @@ void VideoDisplay::PositionVideo() {
// Video is wider than window, blackbox top/bottom // Video is wider than window, blackbox top/bottom
else if (videoAr - displayAr > 0.01) { else if (videoAr - displayAr > 0.01) {
int delta = client_h - client_w / videoAr; int delta = client_h - client_w / videoAr;
viewport_top = viewport_bottom = delta / 2; viewport_top += delta / 2;
viewport_bottom += delta / 2;
viewport_height -= delta; viewport_height -= delta;
viewport_width = viewport_height * videoAr; viewport_width = viewport_height * videoAr;
} }
@ -436,10 +437,27 @@ void VideoDisplay::SetWindowZoom(double value) {
void VideoDisplay::SetVideoZoom(double value) { void VideoDisplay::SetVideoZoom(double value) {
if (value == 0) return; if (value == 0) return;
value = std::max(value, .125); value = std::max(value, .125);
Vector2D mp = tool->FromScriptCoords(GetMousePosition());
// With the current blackbox algorithm in PositionVideo(), viewport_{width,height} could go negative. Stop that here
wxSize cs = GetClientSize(); wxSize cs = GetClientSize();
pan_x *= value / videoZoomValue; wxSize videoNewSize = videoSize * (value / videoZoomValue);
pan_y *= value / videoZoomValue; float windowAR = (float)cs.GetWidth() / cs.GetHeight();
float videoAR = (float)videoNewSize.GetWidth() / videoNewSize.GetHeight();
if (windowAR < videoAR) {
float delta = cs.GetHeight() - cs.GetWidth() / videoAR;
if (videoNewSize.GetHeight() - delta < 0)
return;
}
// Mouse coordinates, relative to the video, at the current zoom level
Vector2D mp = GetMousePosition() * videoZoomValue * windowZoomValue;
// The video size will change by this many pixels
int pixelChangeW = videoSize.GetWidth() * (value / videoZoomValue - 1);
int pixelChangeH = videoSize.GetHeight() * (value / videoZoomValue - 1);
pan_x -= pixelChangeW * (mp.X() / videoSize.GetWidth());
pan_y -= pixelChangeH * (mp.Y() / videoSize.GetHeight());
videoZoomValue = value; videoZoomValue = value;
UpdateSize(); UpdateSize();