diff --git a/aegisub/frame_main_events.cpp b/aegisub/frame_main_events.cpp index 78a8a627a..293abd316 100644 --- a/aegisub/frame_main_events.cpp +++ b/aegisub/frame_main_events.cpp @@ -1463,10 +1463,10 @@ void FrameMain::OnToggleTags(wxCommandEvent &event) { } // Show on status bar - wxString message = _T("ASS Override Tag mode set to "); - if (tagMode == 0) message += _T("show full tags."); - if (tagMode == 1) message += _T("simplify tags."); - if (tagMode == 2) message += _T("hide tags."); + wxString message = _("ASS Override Tag mode set to "); + if (tagMode == 0) message += _("show full tags."); + if (tagMode == 1) message += _("simplify tags."); + if (tagMode == 2) message += _("hide tags."); StatusTimeout(message,10000); // Set option diff --git a/aegisub/video_display_visual.cpp b/aegisub/video_display_visual.cpp index bb2be6d7f..a3548bced 100644 --- a/aegisub/video_display_visual.cpp +++ b/aegisub/video_display_visual.cpp @@ -151,6 +151,8 @@ void VideoDisplayVisual::DrawOverlay() { if (diag) { if (VFR_Output.GetFrameAtTime(diag->Start.GetMS(),true) <= frame_n && VFR_Output.GetFrameAtTime(diag->End.GetMS(),false) >= frame_n) { GetLinePosition(diag,dx,dy); + dx = dx * w / sw; + dy = dy * h / sh; if (x >= dx-8 && x <= dx+8 && y >= dy-8 && y <= dy+8) { diagHigh = diag; } @@ -641,8 +643,10 @@ void VideoDisplayVisual::GetLineScale(AssDialogue *diag,float &scalX,float &scal void VideoDisplayVisual::GetLineClip(AssDialogue *diag,int &x1,int &y1,int &x2,int &y2) { // Default values x1 = y1 = 0; - x2 = parent->w-1; - y2 = parent->h-1; + int sw,sh; + parent->GetScriptSize(sw,sh); + x2 = sw-1; + y2 = sh-1; // Prepare overrides diag->ParseASSTags();