feat: enhance clipboard panel positioning with focused window support (#65)

Author: leandromqrs

src/clipboard/clipboardPanel.ts

@@ -4,11 +4,16 @@ import { gettext as _ } from 'gettext';
 import St from '@girs/st-18';
 import GObject from '@girs/gobject-2.0';
 import Clutter from '@girs/clutter-18';
+import type Meta from '@girs/meta-18';
 import * as Main from '@girs/gnome-shell/ui/main';
 
 import type { ClipboardEntry, ClipboardStore } from '~/clipboard/clipboardStore.ts';
 import { ClipboardList } from '~/clipboard/clipboardList.ts';
-import { placeClipboardPanelNearPointer } from '~/clipboard/clipboardPosition.ts';
+import {
+  placeClipboardPanelNearPointer,
+  resolveClipboardPanelAnchor,
+  type ClipboardPanelWindowPlacement,
+} from '~/clipboard/clipboardPosition.ts';
 
 const PANEL_WIDTH = 360;
 const PANEL_HEIGHT = 480;
@@ -99,7 +104,7 @@ export class ClipboardPanel extends St.BoxLayout {
     Main.uiGroup.add_child(this._overlay);
     Main.uiGroup.add_child(this); // panel sits above overlay
 
-    this._positionNearPointer();
+    this._positionNearCurrentAnchor();
 
     this.show();
     this._isOpen = true;
@@ -230,13 +235,22 @@ export class ClipboardPanel extends St.BoxLayout {
     }
   }
 
-  private _positionNearPointer(): void {
+  private _positionNearCurrentAnchor(): void {
     const [pointerX, pointerY] = global.get_pointer();
-    const monitorIndex = this._findMonitorIndexAt(pointerX, pointerY);
-    const workArea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
-    const bounds = placeClipboardPanelNearPointer(
+    const pointerMonitorIndex = this._findMonitorIndexAt(pointerX, pointerY);
+    const anchor = resolveClipboardPanelAnchor(
       pointerX,
       pointerY,
+      pointerMonitorIndex,
+      this._getFocusedWindowPlacement(),
+    );
+    const monitorIndex = this._isMonitorValid(anchor.monitorIndex)
+      ? anchor.monitorIndex
+      : pointerMonitorIndex;
+    const workArea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
+    const bounds = placeClipboardPanelNearPointer(
+      anchor.x,
+      anchor.y,
       workArea,
       PANEL_WIDTH,
       PANEL_HEIGHT,
@@ -264,4 +278,28 @@ export class ClipboardPanel extends St.BoxLayout {
 
     return Main.layoutManager.primaryIndex;
   }
+
+  private _getFocusedWindowPlacement(): ClipboardPanelWindowPlacement | null {
+    const win = global.display.focus_window as Meta.Window | null;
+    if (!win || win.minimized) return null;
+
+    const monitorIndex = win.get_monitor();
+    if (!this._isMonitorValid(monitorIndex)) return null;
+
+    const frame = win.get_frame_rect();
+    return {
+      monitorIndex,
+      frame: {
+        x: frame.x,
+        y: frame.y,
+        width: frame.width,
+        height: frame.height,
+      },
+    };
+  }
+
+  private _isMonitorValid(monitorIndex: number): boolean {
+    const monitors = Main.layoutManager.monitors ?? [];
+    return monitorIndex >= 0 && monitorIndex < monitors.length;
+  }
 }

src/clipboard/clipboardPosition.ts

@@ -5,6 +5,34 @@ export type ClipboardPanelBounds = {
   height: number;
 };
 
+export type ClipboardPanelAnchor = {
+  x: number;
+  y: number;
+  monitorIndex: number;
+};
+
+export type ClipboardPanelWindowPlacement = {
+  monitorIndex: number;
+  frame: ClipboardPanelBounds;
+};
+
+export function resolveClipboardPanelAnchor(
+  pointerX: number,
+  pointerY: number,
+  pointerMonitorIndex: number,
+  focusedWindow: ClipboardPanelWindowPlacement | null,
+): ClipboardPanelAnchor {
+  if (focusedWindow && focusedWindow.monitorIndex >= 0 && hasUsableFrame(focusedWindow.frame)) {
+    return {
+      x: focusedWindow.frame.x + Math.floor(focusedWindow.frame.width / 2),
+      y: focusedWindow.frame.y + Math.floor(focusedWindow.frame.height / 2),
+      monitorIndex: focusedWindow.monitorIndex,
+    };
+  }
+
+  return { x: pointerX, y: pointerY, monitorIndex: pointerMonitorIndex };
+}
+
 export function placeClipboardPanelNearPointer(
   pointerX: number,
   pointerY: number,
@@ -43,3 +71,7 @@ function clamp(value: number, min: number, max: number): number {
   if (max < min) return min;
   return Math.max(min, Math.min(max, value));
 }
+
+function hasUsableFrame(frame: ClipboardPanelBounds): boolean {
+  return frame.width > 0 && frame.height > 0;
+}

tests/unit/clipboardPosition.test.ts

@@ -1,7 +1,10 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
 
-import { placeClipboardPanelNearPointer } from '../../src/clipboard/clipboardPosition.ts';
+import {
+  placeClipboardPanelNearPointer,
+  resolveClipboardPanelAnchor,
+} from '../../src/clipboard/clipboardPosition.ts';
 
 const AREA = { x: 0, y: 24, width: 1280, height: 696 };
 const WIDTH = 380;
@@ -49,3 +52,29 @@ test('placeClipboardPanelNearPointer clamps and shrinks in narrow work areas', (
     height: 236,
   });
 });
+
+test('resolveClipboardPanelAnchor prefers focused window center and monitor', () => {
+  const anchor = resolveClipboardPanelAnchor(100, 120, 0, {
+    monitorIndex: 1,
+    frame: { x: 1920, y: 80, width: 1000, height: 700 },
+  });
+
+  assert.deepEqual(anchor, {
+    x: 2420,
+    y: 430,
+    monitorIndex: 1,
+  });
+});
+
+test('resolveClipboardPanelAnchor falls back to pointer for invalid focused window frame', () => {
+  const anchor = resolveClipboardPanelAnchor(100, 120, 0, {
+    monitorIndex: 1,
+    frame: { x: 1920, y: 80, width: 0, height: 700 },
+  });
+
+  assert.deepEqual(anchor, {
+    x: 100,
+    y: 120,
+    monitorIndex: 0,
+  });
+});