Merge pull request #13 from BlankSourceCode/allow-negative-offset

Allow negative source positions

Author: BlankSourceCode

obs-zoom-to-mouse.lua

@@ -182,13 +182,13 @@ function get_monitor_info(source)
                 end
             end
 
-            -- This works for my machine as the monitor names are given as "U2790B: 3840x2160 @ 0,0 (Primary Monitor)"
+            -- This works for my machine as the monitor names are given as "U2790B: 3840x2160 @ -1920,0 (Primary Monitor)"
             -- I don't know if this holds true for other machines and/or OBS versions
             -- TODO: Update this with some custom FFI calls to find the monitor top-left x and y coordinates if it doesn't work for anyone else
             -- TODO: Refactor this into something that would work with Windows/Linux/Mac assuming we can't do it like this
             if found then
                 log("Parsing display name: " .. found)
-                local x, y = found:match("(%d+),(%d+)")
+                local x, y = found:match("(-?%d+),(-?%d+)")
                 local width, height = found:match("(%d+)x(%d+)")
 
                 info = { x = 0, y = 0, width = 0, height = 0 }
@@ -856,8 +856,7 @@ function on_settings_modified(props, prop, settings)
         name == "monitor_override_h" or
         name == "monitor_override_sx" or
         name == "monitor_override_sy" then
-        local visible = obs.obs_data_get_bool(settings, "use_monitor_override")
-        if visible and source ~= nil then
+        if source ~= nil then
             monitor_info = get_monitor_info(source)
         end
         return name == "use_monitor_override"
@@ -964,8 +963,8 @@ function script_properties()
         "You MUST set manual source position for non-display capture sources")
 
     local override = obs.obs_properties_add_bool(props, "use_monitor_override", "Set manual source position")
-    local override_x = obs.obs_properties_add_int(props, "monitor_override_x", "X", 0, 10000, 1)
-    local override_y = obs.obs_properties_add_int(props, "monitor_override_y", "Y", 0, 10000, 1)
+    local override_x = obs.obs_properties_add_int(props, "monitor_override_x", "X", -10000, 10000, 1)
+    local override_y = obs.obs_properties_add_int(props, "monitor_override_y", "Y", -10000, 10000, 1)
     local override_w = obs.obs_properties_add_int(props, "monitor_override_w", "Width", 0, 10000, 1)
     local override_h = obs.obs_properties_add_int(props, "monitor_override_h", "Height", 0, 10000, 1)
     local override_sx = obs.obs_properties_add_float(props, "monitor_override_sx", "Scale X ", 0, 100, 0.01)

readme.md

@@ -34,6 +34,8 @@ Inspired by [tryptech](https://github.com/tryptech)'s [obs-zoom-and-follow](http
    **Note:** If you don't use this form of setup for your display source (E.g. you have bounding box set to `No bounds` or you have a `Crop` set on the transform), the script will attempt to **automatically change your settings** to zoom compatible ones. 
    This may have undesired effects on your layout (or just not work at all).
 
+   **Note:** If you change your desktop display properties in Windows (such as moving a monitor, changing your primary display, updating the orientation of a display), you will need to re-add your display capture source in OBS for it to update the values that the script uses for its auto calculations. You will then need to reload the script.
+
 ## Usage
 1. You can customize the following settings in the OBS Scripts window:
    * **Zoom Source**: The display capture in the current scene to use for zooming