forked from mia/Aegisub
Originally committed to SVN as r780.
This commit is contained in:
parent
cd0fd49916
commit
9d8ed0fd1d
|
@ -1463,10 +1463,10 @@ void FrameMain::OnToggleTags(wxCommandEvent &event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show on status bar
|
// Show on status bar
|
||||||
wxString message = _T("ASS Override Tag mode set to ");
|
wxString message = _("ASS Override Tag mode set to ");
|
||||||
if (tagMode == 0) message += _T("show full tags.");
|
if (tagMode == 0) message += _("show full tags.");
|
||||||
if (tagMode == 1) message += _T("simplify tags.");
|
if (tagMode == 1) message += _("simplify tags.");
|
||||||
if (tagMode == 2) message += _T("hide tags.");
|
if (tagMode == 2) message += _("hide tags.");
|
||||||
StatusTimeout(message,10000);
|
StatusTimeout(message,10000);
|
||||||
|
|
||||||
// Set option
|
// Set option
|
||||||
|
|
|
@ -151,6 +151,8 @@ void VideoDisplayVisual::DrawOverlay() {
|
||||||
if (diag) {
|
if (diag) {
|
||||||
if (VFR_Output.GetFrameAtTime(diag->Start.GetMS(),true) <= frame_n && VFR_Output.GetFrameAtTime(diag->End.GetMS(),false) >= frame_n) {
|
if (VFR_Output.GetFrameAtTime(diag->Start.GetMS(),true) <= frame_n && VFR_Output.GetFrameAtTime(diag->End.GetMS(),false) >= frame_n) {
|
||||||
GetLinePosition(diag,dx,dy);
|
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) {
|
if (x >= dx-8 && x <= dx+8 && y >= dy-8 && y <= dy+8) {
|
||||||
diagHigh = diag;
|
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) {
|
void VideoDisplayVisual::GetLineClip(AssDialogue *diag,int &x1,int &y1,int &x2,int &y2) {
|
||||||
// Default values
|
// Default values
|
||||||
x1 = y1 = 0;
|
x1 = y1 = 0;
|
||||||
x2 = parent->w-1;
|
int sw,sh;
|
||||||
y2 = parent->h-1;
|
parent->GetScriptSize(sw,sh);
|
||||||
|
x2 = sw-1;
|
||||||
|
y2 = sh-1;
|
||||||
|
|
||||||
// Prepare overrides
|
// Prepare overrides
|
||||||
diag->ParseASSTags();
|
diag->ParseASSTags();
|
||||||
|
|
Loading…
Reference in a new issue