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

Merge branch 'video_panning_option' into feature

This commit is contained in:
arch1t3cht 2022-10-11 18:55:11 +02:00
parent b8b85eb580 b38493ee68
commit 2bcf0c7555
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video_display.cpp
View File

@ -197,11 +197,11 @@ void VideoDisplay::Render() try {
int client_w, client_h; int client_w, client_h;
GetClientSize(&client_w, &client_h); GetClientSize(&client_w, &client_h);
E(glViewport(0, 0, client_w, client_h)); E(glViewport(0, 0, client_w * scale_factor, client_h * scale_factor));
E(glMatrixMode(GL_PROJECTION)); E(glMatrixMode(GL_PROJECTION));
E(glLoadIdentity()); E(glLoadIdentity());
E(glOrtho(0.0f, client_w / scale_factor, client_h / scale_factor, 0.0f, -1000.0f, 1000.0f)); E(glOrtho(0.0f, client_w, client_h, 0.0f, -1000.0f, 1000.0f));
if (OPT_GET("Video/Overscan Mask")->GetBool()) { if (OPT_GET("Video/Overscan Mask")->GetBool()) {
double ar = con->videoController->GetAspectRatioValue(); double ar = con->videoController->GetAspectRatioValue();
@ -276,9 +276,11 @@ void VideoDisplay::PositionVideo() {
int client_w, client_h; int client_w, client_h;
GetClientSize(&client_w, &client_h); GetClientSize(&client_w, &client_h);
client_w *= scale_factor;
client_h *= scale_factor;
viewport_left = 0; viewport_left = 0;
viewport_bottom = client_h * scale_factor - videoSize.GetHeight(); viewport_bottom = client_h - videoSize.GetHeight();
viewport_top = 0; viewport_top = 0;
viewport_width = videoSize.GetWidth(); viewport_width = videoSize.GetWidth();
viewport_height = videoSize.GetHeight(); viewport_height = videoSize.GetHeight();
@ -311,7 +313,7 @@ void VideoDisplay::PositionVideo() {
viewport_bottom -= pan_y; viewport_bottom -= pan_y;
if (tool) { if (tool) {
tool->SetClientSize(client_w * scale_factor, client_h * scale_factor); tool->SetClientSize(client_w, client_h);
tool->SetDisplayArea(viewport_left / scale_factor, viewport_top / scale_factor, tool->SetDisplayArea(viewport_left / scale_factor, viewport_top / scale_factor,
viewport_width / scale_factor, viewport_height / scale_factor); viewport_width / scale_factor, viewport_height / scale_factor);
} }
@ -358,7 +360,7 @@ void VideoDisplay::OnSizeEvent(wxSizeEvent &event) {
/* If the video is moving, we only need to update the size in this case */ /* If the video is moving, we only need to update the size in this case */
else if (videoSize.GetWidth() == 0 && videoSize.GetHeight() == 0) else if (videoSize.GetWidth() == 0 && videoSize.GetHeight() == 0)
videoSize = GetClientSize() * videoZoomValue * scale_factor; videoSize = GetClientSize() * videoZoomValue * scale_factor;
windowZoomValue = double(GetClientSize().GetHeight()) / con->project->VideoProvider()->GetHeight(); windowZoomValue = double(std::max(GetClientSize().GetHeight(), 1) * scale_factor) / con->project->VideoProvider()->GetHeight();
zoomBox->ChangeValue(fmt_wx("%g%%", windowZoomValue * 100.)); zoomBox->ChangeValue(fmt_wx("%g%%", windowZoomValue * 100.));
con->ass->Properties.video_zoom = windowZoomValue; con->ass->Properties.video_zoom = windowZoomValue;
UpdateSize(); UpdateSize();