electron-drag-plus 1.0.8 → 1.0.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +23 -24
- package/dist/index.js.map +1 -1
- package/dist/renderer.js +2 -8
- package/dist/renderer.js.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -15,19 +15,17 @@ function initializeDragPlus(win) {
|
|
|
15
15
|
}
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
|
-
electron_1.ipcMain.on('electron-drag:start', (event,
|
|
18
|
+
electron_1.ipcMain.on('electron-drag:start', (event, _) => {
|
|
19
19
|
const win = electron_1.BrowserWindow.fromWebContents(event.sender);
|
|
20
20
|
if (!win)
|
|
21
21
|
return;
|
|
22
22
|
const winBounds = win.getBounds();
|
|
23
23
|
const cursorScreenPoint = electron_1.screen.getCursorScreenPoint();
|
|
24
|
-
const display = electron_1.screen.getDisplayNearestPoint(cursorScreenPoint);
|
|
25
|
-
const scaleFactor = display.scaleFactor;
|
|
26
24
|
currentWindow = win;
|
|
27
25
|
dragData = {
|
|
28
26
|
isDragging: true,
|
|
29
|
-
|
|
30
|
-
|
|
27
|
+
startMouseX: cursorScreenPoint.x,
|
|
28
|
+
startMouseY: cursorScreenPoint.y,
|
|
31
29
|
windowStartX: winBounds.x,
|
|
32
30
|
windowStartY: winBounds.y,
|
|
33
31
|
originalResizable: win.isResizable(),
|
|
@@ -35,27 +33,26 @@ electron_1.ipcMain.on('electron-drag:start', (event, { x, y }) => {
|
|
|
35
33
|
};
|
|
36
34
|
win.setResizable(false);
|
|
37
35
|
});
|
|
38
|
-
electron_1.ipcMain.on('electron-drag:drag', (event,
|
|
36
|
+
electron_1.ipcMain.on('electron-drag:drag', (event, _) => {
|
|
39
37
|
if (!currentWindow || !dragData || !dragData.isDragging)
|
|
40
38
|
return;
|
|
41
39
|
try {
|
|
40
|
+
if (currentWindow.isDestroyed() || !currentWindow.isFocused()) {
|
|
41
|
+
if (dragData.originalResizable !== undefined) {
|
|
42
|
+
currentWindow.setResizable(dragData.originalResizable);
|
|
43
|
+
}
|
|
44
|
+
dragData = null;
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
42
47
|
const cursorScreenPoint = electron_1.screen.getCursorScreenPoint();
|
|
43
|
-
const
|
|
44
|
-
const
|
|
45
|
-
const scaledX = x / scaleFactor;
|
|
46
|
-
const scaledY = y / scaleFactor;
|
|
47
|
-
const deltaX = scaledX - dragData.startX;
|
|
48
|
-
const deltaY = scaledY - dragData.startY;
|
|
48
|
+
const deltaX = cursorScreenPoint.x - dragData.startMouseX;
|
|
49
|
+
const deltaY = cursorScreenPoint.y - dragData.startMouseY;
|
|
49
50
|
const newX = dragData.windowStartX + deltaX;
|
|
50
51
|
const newY = dragData.windowStartY + deltaY;
|
|
51
52
|
currentWindow.setBounds({
|
|
52
53
|
x: Math.round(newX),
|
|
53
|
-
y: Math.round(newY)
|
|
54
|
-
|
|
55
|
-
height: dragData.originalSize[1]
|
|
56
|
-
}, true);
|
|
57
|
-
dragData.windowStartX = newX;
|
|
58
|
-
dragData.windowStartY = newY;
|
|
54
|
+
y: Math.round(newY)
|
|
55
|
+
});
|
|
59
56
|
}
|
|
60
57
|
catch (error) {
|
|
61
58
|
console.error('拖拽移动出错:', error);
|
|
@@ -64,17 +61,19 @@ electron_1.ipcMain.on('electron-drag:drag', (event, { x, y }) => {
|
|
|
64
61
|
electron_1.ipcMain.on('electron-drag:stop', () => {
|
|
65
62
|
if (!currentWindow || !dragData)
|
|
66
63
|
return;
|
|
64
|
+
if (currentWindow.isDestroyed()) {
|
|
65
|
+
dragData = null;
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
67
68
|
const currentBounds = currentWindow.getBounds();
|
|
68
69
|
try {
|
|
69
|
-
currentWindow.setBounds({
|
|
70
|
-
x: Math.round(currentBounds.x),
|
|
71
|
-
y: Math.round(currentBounds.y),
|
|
72
|
-
width: Math.round(dragData.originalSize[0]),
|
|
73
|
-
height: Math.round(dragData.originalSize[1])
|
|
74
|
-
}, true);
|
|
75
70
|
if (dragData.originalResizable !== undefined) {
|
|
76
71
|
currentWindow.setResizable(dragData.originalResizable);
|
|
77
72
|
}
|
|
73
|
+
currentWindow.setBounds({
|
|
74
|
+
x: Math.round(currentBounds.x),
|
|
75
|
+
y: Math.round(currentBounds.y)
|
|
76
|
+
});
|
|
78
77
|
}
|
|
79
78
|
catch (error) {
|
|
80
79
|
console.error('恢复窗口状态出错:', error);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/renderer.js
CHANGED
|
@@ -45,10 +45,7 @@ function handleMouseDown(e) {
|
|
|
45
45
|
dragStartX = e.screenX;
|
|
46
46
|
dragStartY = e.screenY;
|
|
47
47
|
if (ipcRenderer && typeof ipcRenderer.send === 'function') {
|
|
48
|
-
ipcRenderer.send('electron-drag:start'
|
|
49
|
-
x: e.screenX,
|
|
50
|
-
y: e.screenY
|
|
51
|
-
});
|
|
48
|
+
ipcRenderer.send('electron-drag:start');
|
|
52
49
|
}
|
|
53
50
|
}
|
|
54
51
|
}
|
|
@@ -59,10 +56,7 @@ function handleMouseMove(e) {
|
|
|
59
56
|
const deltaY = e.screenY - dragStartY;
|
|
60
57
|
if (Math.abs(deltaX) > 1 || Math.abs(deltaY) > 1) {
|
|
61
58
|
if (ipcRenderer && typeof ipcRenderer.send === 'function') {
|
|
62
|
-
ipcRenderer.send('electron-drag:drag'
|
|
63
|
-
x: e.screenX,
|
|
64
|
-
y: e.screenY
|
|
65
|
-
});
|
|
59
|
+
ipcRenderer.send('electron-drag:drag');
|
|
66
60
|
}
|
|
67
61
|
dragStartX = e.screenX;
|
|
68
62
|
dragStartY = e.screenY;
|
package/dist/renderer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.ts"],"names":[],"mappings":"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"}
|