colin/uosc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch pause_on_click from boolean to milliseconds configand filter out double-clicks

Browse Source
This commit is contained in:
Tomas Sardyha
2020-04-12 13:02:41 +02:00
parent 0a679b0fb6
commit ef1dbd2ee6
3 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@@ -78,9 +78,10 @@ menu_item_height=40
menu_item_height_fullscreen=50 menu_item_height_fullscreen=50
menu_opacity=0.8 menu_opacity=0.8
# pause video on short clicks so you can both drag and pause video with # pause video on clicks shorter than this number of milliseconds
# left mouse button and no conflicts between the two # enables you to use left mouse button for both dragging and pausing the video
pause_on_click=no # I recommend a duration of 120, leave at 0 to disable
pause_on_click_shorter_than=0
# proximity below which elements are fully faded in/expanded # proximity below which elements are fully faded in/expanded
proximity_min=40 proximity_min=40
# proximity above which elements are fully faded out/retracted # proximity above which elements are fully faded out/retracted

7
uosc.conf
View File

@@ -46,9 +46,10 @@ menu_item_height=40
menu_item_height_fullscreen=50 menu_item_height_fullscreen=50
menu_opacity=0.8 menu_opacity=0.8
# pause video on short clicks so you can both drag and pause video with # pause video on clicks shorter than this number of milliseconds
# left mouse button and no conflicts between the two # enables you to use left mouse button for both dragging and pausing the video
pause_on_click=no # I recommend a duration of 120, leave at 0 to disable
pause_on_click_shorter_than=0
# proximity below which elements are fully faded in/expanded # proximity below which elements are fully faded in/expanded
proximity_min=40 proximity_min=40
# proximity above which elements are fully faded out/retracted # proximity above which elements are fully faded out/retracted

33
uosc.lua
View File

@@ -64,9 +64,10 @@ menu_item_height=40
menu_item_height_fullscreen=50 menu_item_height_fullscreen=50
menu_opacity=0.8 menu_opacity=0.8
# pause video on short clicks so you can both drag and pause video with # pause video on clicks shorter than this number of milliseconds
# left mouse button and no conflicts between the two # enables you to use left mouse button for both dragging and pausing the video
pause_on_click=no # I recommend a duration of 120, leave at 0 to disable
pause_on_click_shorter_than=0
# proximity below which elements are fully faded in/expanded # proximity below which elements are fully faded in/expanded
proximity_min=40 proximity_min=40
# proximity above which elements are fully faded out/retracted # proximity above which elements are fully faded out/retracted
@@ -194,7 +195,8 @@ local options = {
menu_item_height_fullscreen = 50, menu_item_height_fullscreen = 50,
menu_opacity = 0.9, menu_opacity = 0.9,
pause_on_click = false, pause_on_click_shorter_than = 0,
click_duration = 110,
proximity_min = 40, proximity_min = 40,
proximity_max = 120, proximity_max = 120,
color_foreground = 'ffffff', color_foreground = 'ffffff',
@@ -2267,13 +2269,28 @@ local base_keybinds = {
{'mouse_move', create_mouse_event_handler('mouse_move')}, {'mouse_move', create_mouse_event_handler('mouse_move')},
{'mouse_leave', create_mouse_event_handler('mouse_leave')}, {'mouse_leave', create_mouse_event_handler('mouse_leave')},
} }
if options.pause_on_click then if options.pause_on_click_shorter_than > 0 then
-- Cycles pause when click is shorter than `options.pause_on_click_shorter_than`
-- while filtering out double clicks.
local duration_seconds = options.pause_on_click_shorter_than / 1000
local last_down_event;
local click_timer = mp.add_timeout(duration_seconds, function()
mp.command('cycle pause')
print('pausing')
end);
click_timer:kill()
base_keybinds[#base_keybinds + 1] = {'mbtn_left', function() base_keybinds[#base_keybinds + 1] = {'mbtn_left', function()
if mp.get_time() - state.last_base_mbtn_left_down_time < 0.11 then if mp.get_time() - last_down_event < duration_seconds then
mp.command('cycle pause') click_timer:resume()
end end
end, function() end, function()
state.last_base_mbtn_left_down_time = mp.get_time() if click_timer:is_enabled() then
print('killing')
click_timer:kill()
last_down_event = 0
else
last_down_event = mp.get_time()
end
end end
} }
end end