diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-27 12:20:13 +0200 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-27 12:34:07 +0200 |
commit | e112ac81d1c3a91d46ea660ac4e01e6c94ee900e (patch) | |
tree | 284226e20c4c25d0b1d04fc0fc4056aa66ffff33 /avmedia/source/viewer | |
parent | b5529c8c457f442bfc43305becc0c02d6a09ee80 (diff) |
First try to render OpenGL content in a window
Change-Id: Ibb7178330d356806cea2cfc972b361167d5a9340
Diffstat (limited to 'avmedia/source/viewer')
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index a84e42fe5f14..87d61cb3e736 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -86,11 +86,6 @@ MediaChildWindow::MediaChildWindow( Window* pParent ) : MediaChildWindow::MediaChildWindow( Window* pParent, SystemWindowData* pData ) : SystemChildWindow( pParent, 0, pData ) { - SetMouseTransparent( true ); - SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - EnableEraseBackground( false ); - SetControlForeground(); - SetControlBackground(); } MediaChildWindow::~MediaChildWindow() @@ -515,7 +510,6 @@ void MediaWindowImpl::onURLChanged() mpChildWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); mxEventsIf.set( static_cast< ::cppu::OWeakObject* >( mpEvents = new MediaEventListenersImpl( *mpChildWindow.get() ) ) ); - if( mxPlayer.is() ) { uno::Sequence< uno::Any > aArgs( 3 ); @@ -569,6 +563,8 @@ void MediaWindowImpl::onURLChanged() void MediaWindowImpl::setPosSize( const Rectangle& rRect ) { SetPosSizePixel( rRect.TopLeft(), rRect.GetSize() ); + if( mxPlayerWindow.is() ) + mxPlayerWindow->setPosSize( 0, 0, rRect.GetSize().Width(), rRect.GetSize().Height(), 0 ); } @@ -615,9 +611,6 @@ void MediaWindowImpl::Resize() mpMediaWindowControl->SetPosSizePixel( Point( nOffset, nControlY ), Size( aCurSize.Width() - ( nOffset << 1 ), nControlHeight ) ); } - if( mxPlayerWindow.is() ) - mxPlayerWindow->setPosSize( 0, 0, aPlayerWindowSize.Width(), aPlayerWindowSize.Height(), 0 ); - if( mpChildWindow ) mpChildWindow->SetPosSizePixel( Point( 0, 0 ), aPlayerWindowSize ); } |