BOOL b_have_splitter = psz_splitter != NULL && *psz_splitter != '\0';
free(psz_splitter);
- if (!b_have_splitter && (var_InheritBool(VLCIntf, "fullscreen") || var_GetBool(pl_Get(VLCIntf), "fullscreen"))) {
+ if (!b_video_wallpaper && !b_have_splitter && (var_InheritBool(VLCIntf, "fullscreen") || var_GetBool(pl_Get(VLCIntf), "fullscreen"))) {
// this is not set when we start in fullscreen because of
// fullscreen settings in video prefs the second time
{
unsigned i_state = va_arg(args, unsigned);
+ if (i_state & VOUT_WINDOW_STATE_BELOW)
+ {
+ msg_Dbg(p_wnd, "Ignore change to VOUT_WINDOW_STATE_BELOW");
+ goto out;
+ }
+
NSInteger i_cooca_level = NSNormalWindowLevel;
if (i_state & VOUT_WINDOW_STATE_ABOVE)
i_cooca_level = NSStatusWindowLevel;
}
case VOUT_WINDOW_SET_SIZE:
{
-
unsigned int i_width = va_arg(args, unsigned int);
unsigned int i_height = va_arg(args, unsigned int);
}
case VOUT_WINDOW_SET_FULLSCREEN:
{
+ if (var_InheritBool(VLCIntf, "video-wallpaper")) {
+ msg_Dbg(p_wnd, "Ignore fullscreen event as video-wallpaper is on");
+ goto out;
+ }
+
int i_full = va_arg(args, int);
BOOL b_animation = YES;
}
}
+out:
[o_vout_provider_lock unlock];
[o_pool release];
return VLC_SUCCESS;