summaryrefslogtreecommitdiffstats
path: root/mpvcore
diff options
context:
space:
mode:
authorChrisK2 <spam@kalania.de>2013-10-13 05:38:13 +0200
committerChrisK2 <spam@kalania.de>2013-10-13 05:38:13 +0200
commit1560d6ce60db425e59aca4371ba9dff967fde69e (patch)
treeb3960668a1bfc039b39ef8aaa487f78a4defe01d /mpvcore
parent9b20c681fd19d9f9d92fda80c82dd6171c6d39a9 (diff)
downloadmpv-1560d6ce60db425e59aca4371ba9dff967fde69e.tar.bz2
mpv-1560d6ce60db425e59aca4371ba9dff967fde69e.tar.xz
osc: fix mouse hiding
Diffstat (limited to 'mpvcore')
-rw-r--r--mpvcore/lua/osc.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/mpvcore/lua/osc.lua b/mpvcore/lua/osc.lua
index 00c38b5c08..3bbfff88c4 100644
--- a/mpvcore/lua/osc.lua
+++ b/mpvcore/lua/osc.lua
@@ -1061,7 +1061,7 @@ function render()
- if not (state.showtime == nil) and (state.showtime + (user_opts.hidetimeout/1000) < now) and (state.active_element == nil)
+ if not (state.showtime == nil) and (user_opts.hidetimeout >= 0) and (state.showtime + (user_opts.hidetimeout/1000) < now) and (state.active_element == nil)
and not (mouseX >= osc_param.posX - (osc_param.osc_w / 2) and mouseX <= osc_param.posX + (osc_param.osc_w / 2)
and mouseY >= osc_param.posY - (osc_param.osc_h / 2) and mouseY <= osc_param.posY + (osc_param.osc_h / 2)) then
hide_osc()
@@ -1219,7 +1219,7 @@ mp.set_key_bindings({
{"mouse_move", function(e) process_event("mouse_move", nil) end},
{"mouse_leave", mouse_leave},
}, "showhide")
-mp.enable_key_bindings("showhide", "allow-vo-dragging")
+mp.enable_key_bindings("showhide", "allow-vo-dragging|allow-hide-cursor")
--mouse input bindings
mp.set_key_bindings({