Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

console.lua: apply --osd-selected{,-outline}-color to selected completions #15616

Merged
merged 1 commit into from
Jan 4, 2025
Merged

console.lua: apply --osd-selected{,-outline}-color to selected completions #15616

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions player/lua/console.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ local styles = {
error = '{\\1c&H7a77f2&}',
fatal = '{\\1c&H5791f9&}',
suggestion = '{\\1c&Hcc99cc&}',
selected_suggestion = '{\\1c&H2fbdfa&\\b1}',
disabled = '{\\1c&Hcccccc&}',
}
for key, style in pairs(styles) do
Expand Down Expand Up @@ -301,6 +300,19 @@ local function should_highlight_completion(i)
(i == 1 and selected_suggestion_index == 0 and input_caller == nil)
end

local function mpv_color_to_ass(color)
return color:sub(8,9) .. color:sub(6,7) .. color:sub(4,5),
string.format('%x', 255 - tonumber('0x' .. color:sub(2,3)))
kasper93 marked this conversation as resolved.
Show resolved Hide resolved
end

local function get_selected_ass()
kasper93 marked this conversation as resolved.
Show resolved Hide resolved
local color, alpha = mpv_color_to_ass(mp.get_property('osd-selected-color'))
local outline_color, outline_alpha =
mpv_color_to_ass(mp.get_property('osd-selected-outline-color'))
return '{\\1c&H' .. color .. '&\\1a&H' .. alpha ..
'&\\3c&H' .. outline_color .. '&\\3a&H' .. outline_alpha .. '&}'
end

-- Takes a list of strings, a max width in characters and
-- optionally a max row count.
-- The result contains at least one column.
Expand Down Expand Up @@ -383,8 +395,8 @@ local function format_table(list, width_max, rows_max)
columns[column] = ass_escape(string.format(format_string, list[i]))

if should_highlight_completion(i) then
columns[column] = styles.selected_suggestion .. columns[column]
.. '{\\b}' .. styles.suggestion
columns[column] = '{\\b1}' .. get_selected_ass() .. columns[column] ..
'{\\b\\1a&\\3a&}' .. styles.suggestion
end
end
-- first row is at the bottom
Expand All @@ -406,11 +418,6 @@ local function fuzzy_find(needle, haystacks, case_sensitive)
return result
end

local function mpv_color_to_ass(color)
return color:sub(8,9) .. color:sub(6,7) .. color:sub(4,5),
string.format('%x', 255 - tonumber('0x' .. color:sub(2,3)))
end

local function populate_log_with_matches()
if not selectable_items or selected_match == 0 then
return
Expand Down Expand Up @@ -453,11 +460,7 @@ local function populate_log_with_matches()
local terminal_style = ''

if i == selected_match or matches[i].index == default_item then
local color, alpha = mpv_color_to_ass(mp.get_property('osd-selected-color'))
local outline_color, outline_alpha =
mpv_color_to_ass(mp.get_property('osd-selected-outline-color'))
style = '{\\1c&H' .. color .. '&\\1a&H' .. alpha ..
'&\\3c&H' .. outline_color .. '&\\3a&H' .. outline_alpha .. '&}'
style = get_selected_ass()
end
if matches[i].index == default_item then
terminal_style = terminal_styles.default_item
Expand Down
Loading