electron-drag-plus 1.0.14 → 1.1.0
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 +63 -33
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -2,22 +2,19 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.initializeDragPlus = initializeDragPlus;
|
|
4
4
|
const electron_1 = require("electron");
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
let currentCallbacks = null;
|
|
5
|
+
const windowDragDataMap = new Map();
|
|
6
|
+
const windowCallbacksMap = new Map();
|
|
8
7
|
function initializeDragPlus(win, callbacks) {
|
|
9
8
|
if (!win) {
|
|
10
9
|
throw new Error('窗口实例不能为空');
|
|
11
10
|
}
|
|
12
11
|
if (callbacks) {
|
|
13
|
-
|
|
12
|
+
windowCallbacksMap.set(win, callbacks);
|
|
14
13
|
}
|
|
15
14
|
win.on('closed', () => {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
currentCallbacks = null;
|
|
20
|
-
}
|
|
15
|
+
windowDragDataMap.delete(win);
|
|
16
|
+
windowCallbacksMap.delete(win);
|
|
17
|
+
console.log('窗口关闭，清理相关资源');
|
|
21
18
|
});
|
|
22
19
|
}
|
|
23
20
|
electron_1.ipcMain.on('electron-drag:start', (event, _) => {
|
|
@@ -25,42 +22,67 @@ electron_1.ipcMain.on('electron-drag:start', (event, _) => {
|
|
|
25
22
|
if (!win)
|
|
26
23
|
return;
|
|
27
24
|
const winBounds = win.getBounds();
|
|
25
|
+
const display = electron_1.screen.getDisplayNearestPoint(electron_1.screen.getCursorScreenPoint());
|
|
26
|
+
const scaleFactor = display.scaleFactor;
|
|
28
27
|
const cursorScreenPoint = electron_1.screen.getCursorScreenPoint();
|
|
29
|
-
|
|
30
|
-
dragData = {
|
|
28
|
+
windowDragDataMap.set(win, {
|
|
31
29
|
isDragging: true,
|
|
32
30
|
offsetX: cursorScreenPoint.x - winBounds.x,
|
|
33
31
|
offsetY: cursorScreenPoint.y - winBounds.y,
|
|
34
32
|
originalResizable: win.isResizable(),
|
|
35
|
-
originalSize: [winBounds.width, winBounds.height]
|
|
36
|
-
|
|
33
|
+
originalSize: [winBounds.width, winBounds.height],
|
|
34
|
+
scaleFactor: scaleFactor
|
|
35
|
+
});
|
|
37
36
|
win.setResizable(false);
|
|
38
37
|
console.log('拖拽开始~');
|
|
39
|
-
|
|
38
|
+
const callbacks = windowCallbacksMap.get(win);
|
|
39
|
+
if (callbacks && callbacks.onDragStart) {
|
|
40
40
|
try {
|
|
41
41
|
console.log('拖拽开始回调~');
|
|
42
|
-
|
|
42
|
+
callbacks.onDragStart(win);
|
|
43
43
|
}
|
|
44
44
|
catch (error) {
|
|
45
45
|
console.error('拖拽开始回调执行出错:', error);
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
|
+
else {
|
|
49
|
+
console.log(`窗口回调未找到或未定义onDragStart，当前注册的窗口数: ${windowCallbacksMap.size}`);
|
|
50
|
+
}
|
|
48
51
|
});
|
|
49
52
|
electron_1.ipcMain.on('electron-drag:drag', (event, _) => {
|
|
50
|
-
|
|
53
|
+
const win = electron_1.BrowserWindow.fromWebContents(event.sender);
|
|
54
|
+
if (!win)
|
|
55
|
+
return;
|
|
56
|
+
const dragData = windowDragDataMap.get(win);
|
|
57
|
+
if (!dragData || !dragData.isDragging)
|
|
51
58
|
return;
|
|
52
59
|
try {
|
|
53
|
-
if (
|
|
60
|
+
if (win.isDestroyed() || !win.isFocused()) {
|
|
54
61
|
if (dragData.originalResizable !== undefined) {
|
|
55
|
-
|
|
62
|
+
win.setResizable(dragData.originalResizable);
|
|
56
63
|
}
|
|
57
|
-
|
|
64
|
+
windowDragDataMap.delete(win);
|
|
58
65
|
return;
|
|
59
66
|
}
|
|
67
|
+
const currentDisplay = electron_1.screen.getDisplayNearestPoint(electron_1.screen.getCursorScreenPoint());
|
|
68
|
+
const currentScaleFactor = currentDisplay.scaleFactor;
|
|
60
69
|
const cursorScreenPoint = electron_1.screen.getCursorScreenPoint();
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
70
|
+
let newX = cursorScreenPoint.x - dragData.offsetX;
|
|
71
|
+
let newY = cursorScreenPoint.y - dragData.offsetY;
|
|
72
|
+
const winBounds = win.getBounds();
|
|
73
|
+
const windowCenter = {
|
|
74
|
+
x: winBounds.x + winBounds.width / 2,
|
|
75
|
+
y: winBounds.y + winBounds.height / 2
|
|
76
|
+
};
|
|
77
|
+
const windowDisplay = electron_1.screen.getDisplayNearestPoint(windowCenter);
|
|
78
|
+
const windowScaleFactor = windowDisplay.scaleFactor;
|
|
79
|
+
if (Math.abs(currentScaleFactor - windowScaleFactor) > 0.01) {
|
|
80
|
+
const adjustedOffsetX = dragData.offsetX * (windowScaleFactor / currentScaleFactor);
|
|
81
|
+
const adjustedOffsetY = dragData.offsetY * (windowScaleFactor / currentScaleFactor);
|
|
82
|
+
newX = cursorScreenPoint.x - adjustedOffsetX;
|
|
83
|
+
newY = cursorScreenPoint.y - adjustedOffsetY;
|
|
84
|
+
}
|
|
85
|
+
win.setBounds({
|
|
64
86
|
x: Math.round(newX),
|
|
65
87
|
y: Math.round(newY)
|
|
66
88
|
});
|
|
@@ -69,20 +91,24 @@ electron_1.ipcMain.on('electron-drag:drag', (event, _) => {
|
|
|
69
91
|
console.error('拖拽移动出错:', error);
|
|
70
92
|
}
|
|
71
93
|
});
|
|
72
|
-
electron_1.ipcMain.on('electron-drag:stop', () => {
|
|
73
|
-
|
|
94
|
+
electron_1.ipcMain.on('electron-drag:stop', (event, _) => {
|
|
95
|
+
const win = electron_1.BrowserWindow.fromWebContents(event.sender);
|
|
96
|
+
if (!win)
|
|
74
97
|
return;
|
|
75
|
-
|
|
76
|
-
|
|
98
|
+
const dragData = windowDragDataMap.get(win);
|
|
99
|
+
if (!dragData)
|
|
100
|
+
return;
|
|
101
|
+
if (win.isDestroyed()) {
|
|
102
|
+
windowDragDataMap.delete(win);
|
|
77
103
|
return;
|
|
78
104
|
}
|
|
79
|
-
const currentBounds =
|
|
105
|
+
const currentBounds = win.getBounds();
|
|
80
106
|
console.log('拖拽结束~');
|
|
81
107
|
try {
|
|
82
108
|
if (dragData.originalResizable !== undefined) {
|
|
83
|
-
|
|
109
|
+
win.setResizable(dragData.originalResizable);
|
|
84
110
|
}
|
|
85
|
-
|
|
111
|
+
win.setBounds({
|
|
86
112
|
x: Math.round(currentBounds.x),
|
|
87
113
|
y: Math.round(currentBounds.y)
|
|
88
114
|
});
|
|
@@ -91,23 +117,27 @@ electron_1.ipcMain.on('electron-drag:stop', () => {
|
|
|
91
117
|
console.error('恢复窗口状态出错:', error);
|
|
92
118
|
if (dragData.originalResizable !== undefined) {
|
|
93
119
|
try {
|
|
94
|
-
|
|
120
|
+
win.setResizable(dragData.originalResizable);
|
|
95
121
|
}
|
|
96
122
|
catch (retryError) {
|
|
97
123
|
console.error('恢复窗口可调整状态失败:', retryError);
|
|
98
124
|
}
|
|
99
125
|
}
|
|
100
126
|
}
|
|
101
|
-
|
|
127
|
+
const callbacks = windowCallbacksMap.get(win);
|
|
128
|
+
if (callbacks && callbacks.onDragEnd) {
|
|
102
129
|
try {
|
|
103
130
|
console.log('拖拽结束回调~');
|
|
104
|
-
|
|
131
|
+
callbacks.onDragEnd(win);
|
|
105
132
|
}
|
|
106
133
|
catch (error) {
|
|
107
134
|
console.error('拖拽结束回调执行出错:', error);
|
|
108
135
|
}
|
|
109
136
|
}
|
|
110
|
-
|
|
137
|
+
else {
|
|
138
|
+
console.log(`窗口回调未找到或未定义onDragEnd，当前注册的窗口数: ${windowCallbacksMap.size}`);
|
|
139
|
+
}
|
|
140
|
+
windowDragDataMap.delete(win);
|
|
111
141
|
});
|
|
112
142
|
exports.default = initializeDragPlus;
|
|
113
143
|
//# sourceMappingURL=index.js.map
|
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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"}
|