RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-21 14:22:17 +00:00
Code Issues Releases Wiki Activity

osc: keep track of the "fullscreen" state when it changes

Browse Source 
This avoids having to poll the "fullscreen" property in the tick
callback.
This commit is contained in:
Marcoen Hirschberg 2014-05-29 23:37:47 +02:00 committed by wm4
parent 58b070d178
commit d838bd6420
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
player/lua/osc.lua
View File

@ -72,6 +72,7 @@ local state = {
last_mouseX, last_mouseY, -- last mouse position, to detect siginificant mouse movement
message_text,
message_timeout,
fullscreen = false,
}
@ -587,7 +588,7 @@ function osc_init()
if (mp.get_property("video") == "no") then -- dummy/forced window
scale = user_opts.scaleforcedwindow
elseif (mp.get_property("fullscreen") == "yes") then
elseif state.fullscreen then
scale = user_opts.scalefullscreen
else
scale = user_opts.scalewindowed
@ -820,7 +821,7 @@ function osc_init()
--toggle FS
local contentF = function (ass)
if mp.get_property("fullscreen") == "yes" then
if state.fullscreen then
ass:append("\238\132\137")
else
ass:append("\238\132\136")
@ -1171,7 +1172,7 @@ end
-- called by mpv on every frame
function tick()
if (mp.get_property("fullscreen") == "yes" and user_opts.showfullscreen) or (mp.get_property("fullscreen") == "no" and user_opts.showwindowed) then
if (state.fullscreen and user_opts.showfullscreen) or (not state.fullscreen and user_opts.showwindowed) then
render()
else
mp.set_osd_ass(osc_param.playresy, osc_param.playresy, "")
@ -1195,6 +1196,8 @@ mp.register_event("tracks-changed", request_init)
mp.register_script_message("enable-osc", function() enable_osc(true) end)
mp.register_script_message("disable-osc", function() enable_osc(false) end)
mp.observe_property("fullscreen", "bool", function(name, val) state.fullscreen = val end)
-- mouse show/hide bindings
mp.set_key_bindings({
{"mouse_move", function(e) process_event("mouse_move", nil) end},