oc-tweaks 0.5.0 → 0.5.2

package/dist/index.js

@@ -552,18 +552,20 @@ function calculatePosition(slotIndex, config) {
   const height = config.height;
   const gap = config.gap ?? 12;
   const margin = config.screenMargin ?? 20;
-  const screenWidthExpr = typeof config.screenWidth === "number" ? `${config.screenWidth}` : "[System.Windows.SystemParameters]::PrimaryScreenWidth";
-  const screenHeightExpr = typeof config.screenHeight === "number" ? `${config.screenHeight}` : "[System.Windows.SystemParameters]::PrimaryScreenHeight";
-  const leftExpr = `(${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 = `(${screenHeightExpr} - ${margin} - ((${slotIndex} + 1) * (${height} + ${gap})))`;
+    const topExpr2 = `(${screenBottomExpr} - ${margin} - ((${slotIndex} + 1) * (${height} + ${gap})))`;
     return {
       startupLocation: "Manual",
       leftExpr,
       topExpr: topExpr2
     };
   }
-  const topExpr = `(${margin} + (${slotIndex} * (${height} + ${gap})))`;
+  const topExpr = `(${screenTopExpr} + ${margin} + (${slotIndex} * (${height} + ${gap})))`;
   return {
     startupLocation: "Manual",
     leftExpr,
@@ -660,6 +662,7 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
   const shadow = style?.shadow !== false;
   const idleColor = style?.idleColor ?? "#4ADE80";
   const errorColor = style?.errorColor ?? "#EF4444";
+  const contentMaxWidth = Math.max(160, width - 120);
   const accentColor = renderOptions?.accentColor ?? (tag === "Error" ? errorColor : idleColor);
   const icon = renderOptions?.icon ?? (tag === "Error" ? "❌" : "✅");
   const showDismissHint = renderOptions?.showDismissHint !== false;
@@ -682,7 +685,7 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
     `        WindowStyle="None" AllowsTransparency="True" Background="Transparent"`,
     `        Topmost="True" ShowInTaskbar="False" ShowActivated="False"`,
     `        WindowStartupLocation="${startupLocation}"`,
-    `        Width="${width}" Height="${height}">`,
+    `        SizeToContent="Height" Width="${width}" MinHeight="${height}">`,
     `    <Border CornerRadius="${borderRadius}" Margin="10">`,
     `        <Border.Background>`,
     `            <SolidColorBrush Color="${backgroundColor}" Opacity="${backgroundOpacity}"/>`,
@@ -690,10 +693,10 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
     `        ${shadowXaml}`,
     `        <Grid>`,
     `            <Border CornerRadius="${borderRadius},0,0,${borderRadius}" Width="${colorBarWidth}" HorizontalAlignment="Left" Name="ColorBar"/>`,
-    `            <StackPanel Orientation="Horizontal" Margin="22,0,16,0" VerticalAlignment="Center">`,
+    `            <StackPanel Orientation="Horizontal" Margin="22,12,16,12" VerticalAlignment="Center">`,
     `                <TextBlock Name="IconText" FontSize="${iconFontSize}" VerticalAlignment="Center" Margin="0,0,15,0" Foreground="White"/>`,
-    `                <StackPanel VerticalAlignment="Center" MaxWidth="320">`,
-    `                    <TextBlock Name="TitleText" FontSize="${titleFontSize}" FontWeight="SemiBold"/>`,
+    `                <StackPanel VerticalAlignment="Center" MaxWidth="${contentMaxWidth}">`,
+    `                    <TextBlock Name="TitleText" FontSize="${titleFontSize}" FontWeight="SemiBold" TextWrapping="Wrap"/>`,
     `                    <TextBlock Name="ContentText" Foreground="${textColor}" FontSize="${contentFontSize}" Margin="0,4,0,0" TextWrapping="Wrap"/>`,
     dismissHintXaml,
     `                </StackPanel>`,
@@ -712,6 +715,8 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
     "Add-Type -AssemblyName PresentationFramework",
     "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.0",
+  "version": "0.5.2",
   "type": "module",
   "exports": {
     ".": "./dist/index.js"