stats.lua: inherit --osd-shadow-offset

Unlike font and border sizes, the default stats shadow offset is 0 like --osd-shadow-offset, so it can be inherited from it by default to not make users configure it in 2 places. Since 0 and negative numbers are valid offsets, use infinity as the placeholder for unconfigured values.

Guido Cella committed 1 year ago

Commit d84e1b31 parent fc6ce443 files · +13 −8Browse files

Unified · Split

3 files

DOCS/man/stats.rst +2 −2
etc/builtin.conf +0 −2
player/lua/stats.lua +11 −4

DOCS/man/stats.rst+2−2

@@ -175,12 +175,12 @@ Configurable Options · 174 unmodified lines
175	Color of the text border.	175	Color of the text border.
176		176
177	``shadow_x_offset``	177	``shadow_x_offset``
178	Default: 0	178	Default: same as ``--osd-shadow-offset``
179		179
180	The horizontal distance from the text to position the shadow at.	180	The horizontal distance from the text to position the shadow at.
181		181
182	``shadow_y_offset``	182	``shadow_y_offset``
183	Default: 0	183	Default: same as ``--osd-shadow-offset``
184		184
185	The vertical distance from the text to position the shadow at.	185	The vertical distance from the text to position the shadow at.
186		186

etc/builtin.conf+0−2

@@ -85,8 +85,6 @@ osd-outline-size=0 · 84 unmodified lines
85	osd-shadow-offset=4	85	osd-shadow-offset=4
86	script-opt=console-border_size=0	86	script-opt=console-border_size=0
87	script-opt=stats-border_size=0	87	script-opt=stats-border_size=0
88	script-opt=stats-shadow_x_offset=4
89	script-opt=stats-shadow_y_offset=4
90		88
91	[sub-box]	89	[sub-box]
92	sub-border-style=background-box	90	sub-border-style=background-box

player/lua/stats.lua+11−4

     font_color = "",
     border_size = 1.65,
     border_color = "",
-    shadow_x_offset = 0.0,
+    shadow_x_offset = math.huge,
-    shadow_y_offset = 0.0,
+    shadow_y_offset = math.huge,
     shadow_color = "",
     alpha = "11",
     vidscale = "auto",
             style = style .. "\\4c&H" .. o.shadow_color .. "&\\4a&H" .. o.alpha .. "&"
         end
-        return style .. "\\xshad" .. shadow_x_offset ..
+        if o.shadow_x_offset < math.huge then
-               "\\yshad" .. shadow_y_offset .. "}"
+            style = style .. "\\xshad" .. shadow_x_offset
+        end
+        if o.shadow_y_offset < math.huge then
+            style = style .. "\\yshad" .. shadow_y_offset
+        end
+        return style
     end
 end

stats.lua: inherit --osd-shadow-offset

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code