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

osc: top/bottombar: dynamically size timecodes according to timems

Browse Source
This commit is contained in:
Ricardo Constantino 2016-10-26 03:12:10 +01:00
parent 894dbcd1b7
commit ad819b5458
No known key found for this signature in database
GPG Key ID: EFD16019AE4FF531
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
player/lua/osc.lua
View File

@ -1131,6 +1131,7 @@ layouts["bottombar"] = function()
local padY = 2
local line1 = osc_geo.y + 6 + padY
local line2 = osc_geo.y + 24 + padY
local tc_width = (state.tc_ms) and 100 or 70
osc_param.areas = {}
@ -1201,7 +1202,8 @@ layouts["bottombar"] = function()
-- Left timecode
geo = { x = geo.x + geo.w + padX + 100, y = geo.y, an = 6, w = 100, h = geo.h }
geo = { x = geo.x + geo.w + padX + tc_width, y = geo.y, an = 6,
w = tc_width, h = geo.h }
lo = add_layout("tc_left")
lo.geometry = geo
lo.style = osc_styles.timecodes
@ -1223,8 +1225,8 @@ layouts["bottombar"] = function()
-- Right timecode
geo = { x = geo.x - geo.w - padX - 100, y = geo.y, an = 4,
w = 100, h = geo.h }
geo = { x = geo.x - geo.w - padX - tc_width, y = geo.y, an = 4,
w = tc_width, h = geo.h }
lo = add_layout("tc_right")
lo.geometry = geo
lo.style = osc_styles.timecodes
@ -1266,6 +1268,7 @@ layouts["topbar"] = function()
local padY = 2
local line1 = osc_geo.y - 24 - padY
local line2 = osc_geo.y - 6 - padY
local tc_width = (state.tc_ms) and 100 or 70
osc_param.areas = {}
@ -1310,8 +1313,8 @@ layouts["topbar"] = function()
-- Left timecode
geo = { x = geo.x + geo.w + padX + 100, y = geo.y, an = 6,
w = 100, h = geo.h }
geo = { x = geo.x + geo.w + padX + tc_width, y = geo.y, an = 6,
w = tc_width, h = geo.h }
lo = add_layout("tc_left")
lo.geometry = geo
lo.style = osc_styles.timecodes
@ -1333,8 +1336,8 @@ layouts["topbar"] = function()
-- Right timecode
geo = { x = geo.x - geo.w - padX - 100, y = geo.y, an = 4,
w = 100, h = geo.h }
geo = { x = geo.x - geo.w - padX - tc_width, y = geo.y, an = 4,
w = tc_width, h = geo.h }
lo = add_layout("tc_right")
lo.geometry = geo
lo.style = osc_styles.timecodes
@ -1681,8 +1684,10 @@ function osc_init()
return (mp.get_property_osd("playback-time"))
end
end
ne.eventresponder["mouse_btn0_up"] =
function () state.tc_ms = not state.tc_ms end
ne.eventresponder["mouse_btn0_up"] = function ()
state.tc_ms = not state.tc_ms
request_init()
end
-- tc_right (total/remaining time)
ne = new_element("tc_right", "button")