RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

console.lua: remove the scale script-opt

Browse Source 
This is redundant because you can set font_size and border_size to have
the same effect.
This commit is contained in:
Guido Cella 2024-06-27 12:22:31 +02:00 committed by Dudemanguy
parent b09e48e388
commit 49afdb9365
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DOCS/interface-changes/console-scale.txt Normal file
View File

@ -0,0 +1 @@
remove `console-scale` script-opt

11
DOCS/man/console.rst
View File

@ -131,15 +131,6 @@ documentation.
Configurable Options Configurable Options
~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~
``scale``
Default: 1
All drawing is scaled by this value, including the text borders and the
cursor.
If the VO backend in use has HiDPI scale reporting implemented, the option
value is scaled with the reported HiDPI scale.
``font`` ``font``
Default: unset (picks a hardcoded font depending on detected platform) Default: unset (picks a hardcoded font depending on detected platform)
@ -151,7 +142,7 @@ Configurable Options
Default: 16 Default: 16
Set the font size used for the REPL and the console. This will be Set the font size used for the REPL and the console. This will be
multiplied by "scale". multiplied by ``display-hidpi-scale``.
``border_size`` ``border_size``
Default: 1 Default: 1

8
player/lua/console.lua
View File

@ -17,11 +17,6 @@ local assdraw = require 'mp.assdraw'
-- Default options -- Default options
local opts = { local opts = {
-- All drawing is scaled by this value, including the text borders and the
-- cursor. Change it if you have a high-DPI display.
scale = 1,
-- Set the font used for the REPL and the console.
-- This has to be a monospaced font.
font = "", font = "",
-- Set the font size used for the REPL and the console. This will be -- Set the font size used for the REPL and the console. This will be
-- multiplied by "scale". -- multiplied by "scale".
@ -266,7 +261,6 @@ local function calculate_max_log_lines()
return math.floor(mp.get_property_native('osd-height') return math.floor(mp.get_property_native('osd-height')
/ mp.get_property_native('display-hidpi-scale', 1) / mp.get_property_native('display-hidpi-scale', 1)
/ opts.scale
* (1 - global_margins.t - global_margins.b) * (1 - global_margins.t - global_margins.b)
/ opts.font_size / opts.font_size
-- Subtract 1 for the input line and 1 for the newline -- Subtract 1 for the input line and 1 for the newline
@ -511,8 +505,6 @@ local function update()
local dpi_scale = mp.get_property_native("display-hidpi-scale", 1.0) local dpi_scale = mp.get_property_native("display-hidpi-scale", 1.0)
dpi_scale = dpi_scale * opts.scale
local screenx, screeny = mp.get_osd_size() local screenx, screeny = mp.get_osd_size()
screenx = screenx / dpi_scale screenx = screenx / dpi_scale
screeny = screeny / dpi_scale screeny = screeny / dpi_scale