diff options
| author |  Avi Halachmi (:avih) <avihpit@yahoo.com> | 2017-04-02 21:17:26 +0300 |
|---|---|---|
| committer |  Ricardo Constantino <wiiaboo@gmail.com> | 2017-04-19 20:35:58 +0100 |
| commit | 150c988e8811261ea48a31d26fc0d22f98dcad3b (patch) | |
| tree | 2ca3241d361d5195ed7a1e01504ea9b56590aa2f | |
| parent | 6ccc40aa033ccbc60b66c3400e218fd8988be814 (diff) | |
osc: add user_opts.boxmaxchars for box layout title limit
The default of 80 is conservative to allow relatively wide fonts, but
with many common fonts a bigger number can be used without overflow.
| -rw-r--r-- | DOCS/man/osc.rst | 8 | ||||
| -rw-r--r-- | player/lua/osc.lua | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst index c0ecd48540..eb15056094 100644 --- a/DOCS/man/osc.rst +++ b/DOCS/man/osc.rst @@ -277,6 +277,14 @@ Configurable Options Also supports ``never`` and ``always`` +``boxmaxchars`` + Default: 80 + + Max chars for the osc title at the box layout. mpv does not measure the + text width on screen and so it needs to limit it by number of chars. The + default is conservative to allow wide fonts to be used without overflow. + However, with many common fonts a bigger number can be used. YMMV. + Script Commands ~~~~~~~~~~~~~~~ diff --git a/player/lua/osc.lua b/player/lua/osc.lua index c0fcf1e953..276e34f785 100644 --- a/player/lua/osc.lua +++ b/player/lua/osc.lua @@ -40,6 +40,7 @@ local user_opts = { timetotal = false, -- display total time instead of remaining time? timems = false, -- display timecodes with milliseconds? visibility = "auto", -- only used at init to set visibility_mode(...) + boxmaxchars = 80, -- title crop threshold for box layout } -- read_options may modify hidetimeout, so save the original default value in @@ -662,8 +663,10 @@ function render_elements(master_ass) local maxchars = element.layout.button.maxchars if not (maxchars == nil) and (#buttontext > maxchars) then - if (#buttontext > maxchars+20) then - while (#buttontext > maxchars+20) do + local max_ratio = 1.25 -- up to 25% more chars while shrinking + local limit = math.max(0, math.floor(maxchars * max_ratio) - 3) + if (#buttontext > limit) then + while (#buttontext > limit) do buttontext = buttontext:gsub(".[\128-\191]*$", "") end buttontext = buttontext .. "..." @@ -937,7 +940,7 @@ layouts["box"] = function () lo = add_layout("title") lo.geometry = {x = posX, y = titlerowY, an = 8, w = 496, h = 12} lo.style = osc_styles.vidtitle - lo.button.maxchars = 80 + lo.button.maxchars = user_opts.boxmaxchars lo = add_layout("pl_prev") lo.geometry = |