summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorAvi Halachmi (:avih) <avihpit@yahoo.com>2017-04-02 21:17:26 +0300
committerRicardo Constantino <wiiaboo@gmail.com>2017-04-19 20:35:58 +0100
commit150c988e8811261ea48a31d26fc0d22f98dcad3b (patch)
tree2ca3241d361d5195ed7a1e01504ea9b56590aa2f /player
parent6ccc40aa033ccbc60b66c3400e218fd8988be814 (diff)
downloadmpv-150c988e8811261ea48a31d26fc0d22f98dcad3b.tar.bz2
mpv-150c988e8811261ea48a31d26fc0d22f98dcad3b.tar.xz
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.
Diffstat (limited to 'player')
-rw-r--r--player/lua/osc.lua9
1 files changed, 6 insertions, 3 deletions
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 =