oc-tweaks 0.5.1 → 0.5.2

package/dist/index.js

@@ -552,13 +552,13 @@ function calculatePosition(slotIndex, config) {
   const height = config.height;
   const gap = config.gap ?? 12;
   const margin = config.screenMargin ?? 20;
-  const screenLeftExpr = typeof config.screenLeft === "number" ? `${config.screenLeft}` : "([System.Windows.Forms.Screen]::FromPoint([System.Windows.Forms.Cursor]::Position).WorkingArea.Left)";
-  const screenTopExpr = typeof config.screenTop === "number" ? `${config.screenTop}` : "([System.Windows.Forms.Screen]::FromPoint([System.Windows.Forms.Cursor]::Position).WorkingArea.Top)";
-  const screenWidthExpr = typeof config.screenWidth === "number" ? `${config.screenWidth}` : "([System.Windows.Forms.Screen]::FromPoint([System.Windows.Forms.Cursor]::Position).WorkingArea.Width)";
-  const screenHeightExpr = typeof config.screenHeight === "number" ? `${config.screenHeight}` : "([System.Windows.Forms.Screen]::FromPoint([System.Windows.Forms.Cursor]::Position).WorkingArea.Height)";
-  const leftExpr = `(${screenLeftExpr} + ${screenWidthExpr} - ${width} - ${margin})`;
+  const screenLeftExpr = typeof config.screenLeft === "number" ? `${config.screenLeft}` : "($targetScreen.Left)";
+  const screenTopExpr = typeof config.screenTop === "number" ? `${config.screenTop}` : "($targetScreen.Top)";
+  const screenRightExpr = typeof config.screenWidth === "number" ? `(${screenLeftExpr} + ${config.screenWidth})` : "($targetScreen.Right)";
+  const screenBottomExpr = typeof config.screenHeight === "number" ? `(${screenTopExpr} + ${config.screenHeight})` : "($targetScreen.Bottom)";
+  const leftExpr = `(${screenRightExpr} - ${width} - ${margin})`;
   if (position === "bottom-right") {
-    const topExpr2 = `(${screenTopExpr} + ${screenHeightExpr} - ${margin} - ((${slotIndex} + 1) * (${height} + ${gap})))`;
+    const topExpr2 = `(${screenBottomExpr} - ${margin} - ((${slotIndex} + 1) * (${height} + ${gap})))`;
     return {
       startupLocation: "Manual",
       leftExpr,
@@ -716,6 +716,7 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
     "Add-Type -AssemblyName PresentationCore",
     "Add-Type -AssemblyName WindowsBase",
     "Add-Type -AssemblyName System.Windows.Forms",
+    "$targetScreen = [System.Windows.Forms.Screen]::FromPoint([System.Windows.Forms.Cursor]::Position).WorkingArea",
     "",
     "Add-Type -TypeDefinition @'",
     "using System;",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-tweaks",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "type": "module",
   "exports": {
     ".": "./dist/index.js"