diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2017-10-25 13:21:32 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-04 09:57:43 +0100 |
| commit | a2ec30240f7a9889e8e97b798bd862be160b47bc (patch) | |
| tree | 47ef0ad06be684f35fb947368e77ac77d8b60186 /avmedia | |
| parent | 3f2915c40fcc42ac91f2019fd506bfbdd1e5933f (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/mediaplayer.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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 e3045a63ece8..c8af35df34bf 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -290,7 +290,7 @@ bool MediaWindowImpl::isValid() const Size MediaWindowImpl::getPreferredSize() const { - Size aRet; + Size aRet(480, 360); if( mxPlayer.is() ) { |