summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@overt.org>2019-11-30 08:48:22 +0800
committerPhilip Langdale <philipl@overt.org>2019-11-30 08:56:29 +0800
commit971dbcc21cc1468c23bf37bb6fcc42a7c7797300 (patch)
tree9fcce7b97675546c63b3518e6554e4ecd7908469
parentcb7048700fed5d123e93b95767b4557a6e04353d (diff)
downloadmpv-971dbcc21cc1468c23bf37bb6fcc42a7c7797300.tar.bz2
mpv-971dbcc21cc1468c23bf37bb6fcc42a7c7797300.tar.xz
osc: apply boxvideo margins to the window controls
It seems logical to account for the window controls if `boxvideo` is in use (which has the effect of reducing the size of the video so that the osc is not covering the video).
-rw-r--r--DOCS/man/osc.rst4
-rw-r--r--player/lua/osc.lua3
2 files changed, 6 insertions, 1 deletions
diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst
index f99c86ab4d..f9d3282098 100644
--- a/DOCS/man/osc.rst
+++ b/DOCS/man/osc.rst
@@ -331,7 +331,9 @@ Configurable Options
default values.)
Currently, this is supported for the ``bottombar`` and ``topbar`` layout
- only. The other layouts do not change if this option is set.
+ only. The other layouts do not change if this option is set. Separately,
+ if window controls are present (see below), they will be affected
+ regardless of which osc layout is in use.
The border is static and appears even if the OSC is configured to appear
only on mouse interaction. If the OSC is invisible, the border is simply
diff --git a/player/lua/osc.lua b/player/lua/osc.lua
index ee18d0f89f..848fd25d34 100644
--- a/player/lua/osc.lua
+++ b/player/lua/osc.lua
@@ -1054,6 +1054,9 @@ function window_controls(alignment, topbar)
if topbar then
-- The title is already there as part of the top bar
return
+ else
+ -- Apply boxvideo margins to the control bar
+ osc_param.video_margins.t = wsc_geo.h / osc_param.playresy
end
-- Window Title