Commit 770e4947 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

kva: assume VOUT_DISPLAY_CHANGE_WINDOW_STATE is only called to set video on top

It's supposed to be handled in the window, not in the display module.
parent e41f98e9
......@@ -165,7 +165,7 @@ enum vout_display_query {
VOUT_DISPLAY_CHANGE_FULLSCREEN VLC_DEPRECATED_ENUM, /* bool fs */
/* Ask the module to acknowledge/refuse the window management state change
* after being requested externally or by VOUT_DISPLAY_WINDOW_STATE */
VOUT_DISPLAY_CHANGE_WINDOW_STATE VLC_DEPRECATED_ENUM, /* unsigned state */
VOUT_DISPLAY_CHANGE_WINDOW_STATE VLC_DEPRECATED_ENUM,
#endif
/**
* Notifies a change in display size.
......
......@@ -407,13 +407,9 @@ static int Control( vout_display_t *vd, int query, va_list args )
case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
{
const unsigned state = va_arg( args, unsigned );
const bool is_on_top = (state & VOUT_WINDOW_STATE_ABOVE) != 0;
WinSetWindowPos( sys->frame, HWND_TOP, 0, 0, 0, 0, SWP_ZORDER );
if( is_on_top )
WinSetWindowPos( sys->frame, HWND_TOP, 0, 0, 0, 0, SWP_ZORDER );
sys->is_on_top = is_on_top;
sys->is_on_top = true;
return VLC_SUCCESS;
}
......
......@@ -756,8 +756,7 @@ vout_display_t *vout_display_New(vlc_object_t *parent,
osys->cfg.is_fullscreen = true;
if (var_InheritBool(parent, "video-on-top"))
vout_display_Control(vd, VOUT_DISPLAY_CHANGE_WINDOW_STATE,
(unsigned)VOUT_WINDOW_STATE_ABOVE);
vout_display_Control(vd, VOUT_DISPLAY_CHANGE_WINDOW_STATE);
#endif
if (VoutDisplayCreateRender(vd)) {
......
Supports Markdown
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