mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix a merge conflict and some newline issues

Browse source 
Originally committed to SVN as r4290.
This commit is contained in:
Thomas Goyne 2010-05-16 07:06:08 +00:00
parent 2c876e79c3
commit 49abae2698
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
aegisub/src/video_display.cpp
View file

@ -131,13 +131,13 @@ VideoDisplay::VideoDisplay(VideoBox *box, VideoSlider *ControlSlider, wxTextCtrl
, SubsPosition(SubsPosition) , SubsPosition(SubsPosition)
, PositionDisplay(PositionDisplay) , PositionDisplay(PositionDisplay)
, videoOut(new VideoOutGL()) , videoOut(new VideoOutGL())
, box(box)
, freeSize(false)
, tool(new VisualToolCross(this, video, box->visualSubToolBar)) , tool(new VisualToolCross(this, video, box->visualSubToolBar))
, activeMode(Video_Mode_Standard) , activeMode(Video_Mode_Standard)
, toolBar(box->visualSubToolBar) , toolBar(box->visualSubToolBar)
, scriptW(INT_MIN) , scriptW(INT_MIN)
, scriptH(INT_MIN) , scriptH(INT_MIN)
, box(box)
, freeSize(false)
{ {
box->Bind(wxEVT_COMMAND_TOOL_CLICKED, &VideoDisplay::OnMode, this, Video_Mode_Standard, Video_Mode_Vector_Clip); box->Bind(wxEVT_COMMAND_TOOL_CLICKED, &VideoDisplay::OnMode, this, Video_Mode_Standard, Video_Mode_Vector_Clip);
SetCursor(wxNullCursor); SetCursor(wxNullCursor);
@ -469,15 +469,7 @@ void VideoDisplay::OnMouseEvent(wxMouseEvent& event) {
return; return;
} }
<<<<<<< HEAD
// Enforce correct cursor display
ShowCursor(visualMode != 0);
// Click?
if (event.ButtonDown(wxMOUSE_BTN_ANY)) { if (event.ButtonDown(wxMOUSE_BTN_ANY)) {
=======
if (event.ButtonDown(wxMOUSE_BTN_ANY) || Options.AsBool(L"Video Autofocus")) {
>>>>>>> b1a392b... Make visual tools use only screen coordinates.
SetFocus(); SetFocus();
} }
int wheel = event.GetWheelRotation(); int wheel = event.GetWheelRotation();