colin/uosc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: adapt to the new title-bar state of mpv (#643)

Browse Source 
mpv has added a new option to control window title bar state,
which requires relevant adjustments to be added in uosc
This commit is contained in:
dyphire
2023-09-24 05:17:17 +08:00
committed by GitHub
parent 9628d32937
commit 442967b73b
6 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/uosc/elements/Controls.lua
View File

@@ -328,6 +328,7 @@ end
function Controls:on_dispositions() self:reflow() end function Controls:on_dispositions() self:reflow() end
function Controls:on_display() self:update_dimensions() end function Controls:on_display() self:update_dimensions() end
function Controls:on_prop_border() self:update_dimensions() end function Controls:on_prop_border() self:update_dimensions() end
function Controls:on_prop_title_bar() self:update_dimensions() end
function Controls:on_prop_fullormaxed() self:update_dimensions() end function Controls:on_prop_fullormaxed() self:update_dimensions() end
function Controls:on_timeline_enabled() self:update_dimensions() end function Controls:on_timeline_enabled() self:update_dimensions() end

1
scripts/uosc/elements/Timeline.lua
View File

@@ -106,6 +106,7 @@ end
function Timeline:on_prop_duration() self:decide_enabled() end function Timeline:on_prop_duration() self:decide_enabled() end
function Timeline:on_prop_time() self:decide_enabled() end function Timeline:on_prop_time() self:decide_enabled() end
function Timeline:on_prop_border() self:update_dimensions() end function Timeline:on_prop_border() self:update_dimensions() end
function Timeline:on_prop_title_bar() self:update_dimensions() end
function Timeline:on_prop_fullormaxed() self:update_dimensions() end function Timeline:on_prop_fullormaxed() self:update_dimensions() end
function Timeline:on_display() self:update_dimensions() end function Timeline:on_display() self:update_dimensions() end
function Timeline:on_options() function Timeline:on_options()

7
scripts/uosc/elements/TopBar.lua
View File

@@ -71,7 +71,7 @@ end
function TopBar:decide_enabled() function TopBar:decide_enabled()
if options.top_bar == 'no-border' then if options.top_bar == 'no-border' then
self.enabled = not state.border or state.fullscreen self.enabled = not state.border or state.title_bar == false or state.fullscreen
else else
self.enabled = options.top_bar == 'always' self.enabled = options.top_bar == 'always'
end end
@@ -144,6 +144,11 @@ function TopBar:on_prop_border()
self:update_dimensions() self:update_dimensions()
end end
function TopBar:on_prop_title_bar()
self:decide_enabled()
self:update_dimensions()
end
function TopBar:on_prop_fullscreen() function TopBar:on_prop_fullscreen()
self:decide_enabled() self:decide_enabled()
self:update_dimensions() self:update_dimensions()

1
scripts/uosc/elements/Volume.lua
View File

@@ -247,6 +247,7 @@ end
function Volume:on_display() self:update_dimensions() end function Volume:on_display() self:update_dimensions() end
function Volume:on_prop_border() self:update_dimensions() end function Volume:on_prop_border() self:update_dimensions() end
function Volume:on_prop_title_bar() self:update_dimensions() end
function Volume:on_controls_reflow() self:update_dimensions() end function Volume:on_controls_reflow() self:update_dimensions() end
function Volume:on_options() self:update_dimensions() end function Volume:on_options() self:update_dimensions() end

2
scripts/uosc/elements/WindowBorder.lua
View File

@@ -12,10 +12,12 @@ end
function WindowBorder:decide_enabled() function WindowBorder:decide_enabled()
self.enabled = options.window_border_size > 0 and not state.fullormaxed and not state.border self.enabled = options.window_border_size > 0 and not state.fullormaxed and not state.border
and state.title_bar == false
self.size = self.enabled and options.window_border_size or 0 self.size = self.enabled and options.window_border_size or 0
end end
function WindowBorder:on_prop_border() self:decide_enabled() end function WindowBorder:on_prop_border() self:decide_enabled() end
function WindowBorder:on_prop_title_bar() self:decide_enabled() end
function WindowBorder:on_prop_fullormaxed() self:decide_enabled() end function WindowBorder:on_prop_fullormaxed() self:decide_enabled() end
function WindowBorder:on_options() self:decide_enabled() end function WindowBorder:on_options() self:decide_enabled() end

2
scripts/uosc/main.lua
View File

@@ -464,6 +464,7 @@ state = {
current_chapter = nil, current_chapter = nil,
chapter_ranges = {}, chapter_ranges = {},
border = mp.get_property_native('border'), border = mp.get_property_native('border'),
title_bar = mp.get_property_native('title-bar'),
fullscreen = mp.get_property_native('fullscreen'), fullscreen = mp.get_property_native('fullscreen'),
maximized = mp.get_property_native('window-maximized'), maximized = mp.get_property_native('window-maximized'),
fullormaxed = mp.get_property_native('fullscreen') or mp.get_property_native('window-maximized'), fullormaxed = mp.get_property_native('fullscreen') or mp.get_property_native('window-maximized'),
@@ -812,6 +813,7 @@ mp.observe_property('chapter-list', 'native', function(_, chapters)
Elements:trigger('dispositions') Elements:trigger('dispositions')
end) end)
mp.observe_property('border', 'bool', create_state_setter('border')) mp.observe_property('border', 'bool', create_state_setter('border'))
mp.observe_property('title-bar', 'bool', create_state_setter('title_bar'))
mp.observe_property('loop-file', 'native', create_state_setter('loop_file')) mp.observe_property('loop-file', 'native', create_state_setter('loop_file'))
mp.observe_property('ab-loop-a', 'number', create_state_setter('ab_loop_a')) mp.observe_property('ab-loop-a', 'number', create_state_setter('ab_loop_a'))
mp.observe_property('ab-loop-b', 'number', create_state_setter('ab_loop_b')) mp.observe_property('ab-loop-b', 'number', create_state_setter('ab_loop_b'))