Merge pull request #344 from Samillion/dev_fadein_feat

feat: add an option for osc to fade in

Author: Samillion

docs/USER_OPTS.md

@@ -30,7 +30,8 @@ Create `modernz.conf` in your mpv script-opts directory:
 | ----------------------- | ----- | ---------------------------------------------------------------------- |
 | hidetimeout             | 2000  | time (in ms) before OSC hides if no mouse movement                     |
 | seek_resets_hidetimeout | yes   | if seeking should reset the hidetimeout                                |
-| fadeduration            | 250   | fade-out duration (in ms), set to `"0"` for no fade                    |
+| fadeduration            | 200   | fade-out duration (in ms), set to `"0"` for no fade                    |
+| fadein                  | no    | whether to enable fade-in effect                                       |
 | minmousemove            | 0     | minimum mouse movement (in pixels) required to show OSC                |
 | bottomhover             | yes   | show OSC only when hovering at the bottom                              |
 | bottomhover_zone        | 130   | height of hover zone for bottomhover (in pixels)                       |

modernz.conf

@@ -25,7 +25,9 @@ hidetimeout=1500
 # if seeking should reset the hidetimeout
 seek_resets_hidetimeout=yes
 # fade-out duration (in ms), set to 0 for no fade
-fadeduration=250
+fadeduration=200
+# whether to enable fade-in effect
+fadein=no
 # minimum mouse movement (in pixels) required to show OSC
 minmousemove=0
 # show OSC only when hovering at the bottom

modernz.lua

@@ -33,7 +33,8 @@ local user_opts = {
     -- OSC behaviour and scaling
     hidetimeout = 1500,                    -- time (in ms) before OSC hides if no mouse movement
     seek_resets_hidetimeout = true,        -- if seeking should reset the hidetimeout
-    fadeduration = 250,                    -- fade-out duration (in ms), set to 0 for no fade
+    fadeduration = 200,                    -- fade-out duration (in ms), set to 0 for no fade
+    fadein = false,                        -- whether to enable fade-in effect
     minmousemove = 0,                      -- minimum mouse movement (in pixels) required to show OSC
     bottomhover = true,                    -- show OSC only when hovering at the bottom
     bottomhover_zone = 130,                -- height of hover zone for bottomhover (in pixels)
@@ -2864,9 +2865,15 @@ local function show_osc()
     --remember last time of invocation (mouse move)
     state.showtime = mp.get_time()
 
-    osc_visible(true)
-
-    if user_opts.fadeduration > 0 then
+    if user_opts.fadeduration <= 0 then
+        osc_visible(true)
+    elseif user_opts.fadein then
+        if not state.osc_visible then
+            state.anitype = "in"
+            request_tick()
+        end
+    else
+        osc_visible(true)
         state.anitype = nil
     end
 end