mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Originally committed to SVN as r780.

Browse source
This commit is contained in:
Rodrigo Braz Monteiro 2007-01-12 05:57:45 +00:00
parent cd0fd49916
commit 9d8ed0fd1d
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
aegisub/frame_main_events.cpp
View file

@ -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

8
aegisub/video_display_visual.cpp
View file

@ -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();