avmedia/source/framework/mediaplayer.cxx | 2 +- avmedia/source/viewer/mediawindow_impl.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 5ea28efc864b0b064512f2049a9acd82aeaae808 Author: Xisco Fauli <[email protected]> Date: Wed Oct 25 13:21:32 2017 +0200 tdf#113380: if the player doesn't exist,... ... use the same size as VLC does. See: https://opengrok.libreoffice.org/xref/core/avmedia/source/vlc/vlcplayer.cxx#167 Change-Id: Ib878ded6c8aacf3a04227ab9efaa59b388f8ff51 Reviewed-on: https://gerrit.libreoffice.org/43827 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit a2ec30240f7a9889e8e97b798bd862be160b47bc) Reviewed-on: https://gerrit.libreoffice.org/45781 Reviewed-by: Xisco Faulà <[email protected]> diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index 452d1f1c1566..dad2b2ddbd24 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -53,7 +53,7 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::W SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ), mpMediaWindow( new MediaWindow( this, true ) ) { - const Size aSize( 378, 256 ); + const Size aSize( mpMediaWindow->getPreferredSize() ); SetPosSizePixel( Point( 0, 0 ), aSize ); SetMinOutputSizePixel( aSize ); diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index f5d77615fb1e..b819d4f58b0f 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -291,7 +291,7 @@ bool MediaWindowImpl::isValid() const Size MediaWindowImpl::getPreferredSize() const { - Size aRet; + Size aRet(480, 360); if( mxPlayer.is() ) {
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
