Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix position of the movie when the immediate parent is not the

Browse Source 
top-level parent and the offset from the top-level parent origin needs
to be accounted for.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-12-29 22:48:50 +00:00
parent d8d267726a
commit e7b97da356
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mac/carbon/mediactrl.cpp
View File

@@ -188,7 +188,7 @@ protected:
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend Destructor // wxQTMediaBackend Constructor
// //
// Sets m_timer to NULL signifying we havn't loaded anything yet // Sets m_timer to NULL signifying we havn't loaded anything yet
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -299,7 +299,7 @@ bool wxQTMediaBackend::Load(const wxString& fileName)
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::Load
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -343,7 +343,7 @@ bool wxQTMediaBackend::Load(const wxURI& location)
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::FinishLoad
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -391,7 +391,7 @@ void wxQTMediaBackend::FinishLoad()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::Play
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -404,7 +404,7 @@ bool wxQTMediaBackend::Play()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::Pause
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -417,7 +417,7 @@ bool wxQTMediaBackend::Pause()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::Stop
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -435,7 +435,7 @@ bool wxQTMediaBackend::Stop()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::GetPlaybackRate
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -445,7 +445,7 @@ double wxQTMediaBackend::GetPlaybackRate()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::SetPlaybackRate
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -456,7 +456,7 @@ bool wxQTMediaBackend::SetPlaybackRate(double dRate)
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::SetPosition
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -476,7 +476,7 @@ bool wxQTMediaBackend::SetPosition(wxLongLong where)
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::GetPosition
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -486,7 +486,7 @@ wxLongLong wxQTMediaBackend::GetPosition()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::GetDuration
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -496,7 +496,7 @@ wxLongLong wxQTMediaBackend::GetDuration()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::GetState
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -513,7 +513,7 @@ wxMediaState wxQTMediaBackend::GetState()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::Cleanup
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -527,7 +527,7 @@ void wxQTMediaBackend::Cleanup()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxQTMediaBackend::Move // wxQTMediaBackend::GetVideoSize
// //
// TODO // TODO
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -545,6 +545,11 @@ void wxQTMediaBackend::Move(int x, int y, int w, int h)
{ {
if(m_timer) if(m_timer)
{ {
if ( m_ctrl )
{
m_ctrl->GetParent()->MacWindowToRootWindow(&x, &y);
}
Rect theRect = {y, x, y+h, x+w}; Rect theRect = {y, x, y+h, x+w};
::SetMovieBox(m_movie, &theRect); ::SetMovieBox(m_movie, &theRect);