Commit d5accd8f authored by Daniel Amm's avatar Daniel Amm Committed by Jean-Baptiste Kempf

activex: fix handling of fullscreen mode

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 03a8665d
......@@ -689,6 +689,19 @@ void VLCPlugin::toggleFullscreen()
_WindowsManager.ToggleFullScreen();
}
void VLCPlugin::setFullscreen(BOOL yes)
{
if( yes )
_WindowsManager.StartFullScreen();
else
_WindowsManager.EndFullScreen();
}
BOOL VLCPlugin::getFullscreen()
{
return _WindowsManager.IsFullScreen();
}
HRESULT VLCPlugin::onInPlaceDeactivate(void)
{
if( m_player.mlp().isPlaying() )
......
......@@ -218,6 +218,8 @@ public:
RECT getPosRect(void) { return _posRect; };
inline HWND getInPlaceWindow(void) const { return _inplacewnd; };
void toggleFullscreen();
void setFullscreen(BOOL yes);
BOOL getFullscreen();
BOOL isInPlaceActive(void);
......
......@@ -920,13 +920,13 @@ STDMETHODIMP VLCVideo::get_fullscreen(VARIANT_BOOL* fullscreen)
if( NULL == fullscreen )
return E_POINTER;
*fullscreen = _plug->get_player().get_mp().fullscreen();
*fullscreen = _plug->getFullscreen();
return S_OK;
}
STDMETHODIMP VLCVideo::put_fullscreen(VARIANT_BOOL fullscreen)
{
_plug->get_player().get_mp().setFullscreen( VARIANT_FALSE != fullscreen );
_plug->setFullscreen( VARIANT_FALSE != fullscreen );
return S_OK;
}
......@@ -1133,7 +1133,7 @@ STDMETHODIMP VLCVideo::takeSnapshot(LPPICTUREDISP* picture)
STDMETHODIMP VLCVideo::toggleFullscreen()
{
_plug->get_player().get_mp().toggleFullscreen();
_plug->toggleFullscreen();
return S_OK;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment