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

osc: bottombar/topbar: make chapter markers slightly bigger

Browse Source 
1px squares to 2px triangles and layout=box markers from 1px
squares to 2x1px rectangles.

While we're at it, wrap a few lines to 80col again.
This commit is contained in:
Ricardo Constantino 2016-12-23 01:05:25 +00:00
parent 1c761bd6f5
commit 321dd794c8
No known key found for this signature in database
GPG Key ID: EFD16019AE4FF531
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
player/lua/osc.lua
View File

@ -459,20 +459,19 @@ function prepare_elements()
elem_geo.h - slider_lo.border) elem_geo.h - slider_lo.border)
end end
else -- draw 1px nibbles else -- draw 2x1px nibbles
--top --top
if (slider_lo.nibbles_top) then if (slider_lo.nibbles_top) then
static_ass:rect_cw(s - 0.5, slider_lo.gap, static_ass:rect_cw(s - 1, slider_lo.border,
s + 0.5, slider_lo.gap*2); s + 1, slider_lo.border + slider_lo.gap);
end end
--bottom --bottom
if (slider_lo.nibbles_bottom) then if (slider_lo.nibbles_bottom) then
static_ass:rect_cw(s - 0.5, static_ass:rect_cw(s - 1,
elem_geo.h - slider_lo.gap*2, elem_geo.h -slider_lo.border -slider_lo.gap,
s + 0.5, s + 1, elem_geo.h - slider_lo.border);
elem_geo.h - slider_lo.gap);
end end
end end
end end
@ -548,14 +547,12 @@ function render_elements(master_ass)
elem_ass:merge(element.static_ass) elem_ass:merge(element.static_ass)
end end
if (element.type == "slider") then if (element.type == "slider") then
local slider_lo = element.layout.slider local slider_lo = element.layout.slider
local elem_geo = element.layout.geometry local elem_geo = element.layout.geometry
local s_min, s_max = element.slider.min.value, element.slider.max.value local s_min = element.slider.min.value
local s_max = element.slider.max.value
-- draw pos marker -- draw pos marker
local pos = element.slider.posF() local pos = element.slider.posF()
@ -568,7 +565,6 @@ function render_elements(master_ass)
(slider_lo.stype == "knob") then (slider_lo.stype == "knob") then
foH = elem_geo.h / 2 foH = elem_geo.h / 2
elseif (slider_lo.stype == "bar") then elseif (slider_lo.stype == "bar") then
foV = foV + 1
foH = slider_lo.border + slider_lo.gap foH = slider_lo.border + slider_lo.gap
end end
@ -585,10 +581,12 @@ function render_elements(master_ass)
elem_ass:line_to(xp, (innerH)+foV) elem_ass:line_to(xp, (innerH)+foV)
elem_ass:line_to(xp-(innerH/2), (innerH/2)+foV) elem_ass:line_to(xp-(innerH/2), (innerH/2)+foV)
elseif (slider_lo.stype == "knob") then elseif (slider_lo.stype == "knob") then
elem_ass:rect_cw(xp, (9*innerH/20)+foV, elem_geo.w - foH, (11*innerH/20)+foV) elem_ass:rect_cw(xp, (9*innerH/20) + foV,
elem_ass:rect_cw(foH, (3*innerH/8)+foV, xp, (5*innerH/8)+foV) elem_geo.w - foH, (11*innerH/20) + foV)
elem_ass:round_rect_cw(xp - innerH/2, foV, xp + innerH/2, elem_ass:rect_cw(foH, (3*innerH/8) + foV,
foV + innerH, innerH/2.0) xp, (5*innerH/8) + foV)
elem_ass:round_rect_cw(xp - innerH/2, foV,
xp + innerH/2, foV + innerH, innerH/2.0)
end end
end end
@ -1296,6 +1294,7 @@ layouts["bottombar"] = function()
lo.geometry = geo lo.geometry = geo
lo.style = osc_styles.timecodes lo.style = osc_styles.timecodes
lo.slider.border = 0 lo.slider.border = 0
lo.slider.gap = 2
lo.slider.tooltip_style = osc_styles.timePosBar lo.slider.tooltip_style = osc_styles.timePosBar
lo.slider.tooltip_an = 5 lo.slider.tooltip_an = 5
lo.slider.stype = user_opts["seekbarstyle"] lo.slider.stype = user_opts["seekbarstyle"]
@ -1403,7 +1402,8 @@ layouts["topbar"] = function()
-- Seekbar -- Seekbar
geo = { x = sb_l, y = user_opts.barmargin, an = 7, w = math.max(0, sb_r - sb_l), h = geo.h } geo = { x = sb_l, y = user_opts.barmargin, an = 7,
w = math.max(0, sb_r - sb_l), h = geo.h }
new_element("bgbar1", "box") new_element("bgbar1", "box")
lo = add_layout("bgbar1") lo = add_layout("bgbar1")
@ -1417,6 +1417,7 @@ layouts["topbar"] = function()
lo.geometry = geo lo.geometry = geo
lo.style = osc_styles.timecodesBar lo.style = osc_styles.timecodesBar
lo.slider.border = 0 lo.slider.border = 0
lo.slider.gap = 2
lo.slider.tooltip_style = osc_styles.timePosBar lo.slider.tooltip_style = osc_styles.timePosBar
lo.slider.stype = user_opts["seekbarstyle"] lo.slider.stype = user_opts["seekbarstyle"]
lo.slider.tooltip_an = 5 lo.slider.tooltip_an = 5