pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Fix bug 79612' (#563) from fix/bug-79612 into release/v9.3.0

Browse Source
This commit is contained in:
Maxim Kadushkin
2026-02-01 18:57:16 +00:00
parent a7fd3019f3 9907bb3c48
commit ff47910b88
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
macos/ONLYOFFICE/AppDelegate.mm
View File

@ -69,7 +69,6 @@
@interface AppDelegate () { @interface AppDelegate () {
ASCPrinterContext * m_pContext; ASCPrinterContext * m_pContext;
NSTimer *dropTimer; NSTimer *dropTimer;
BOOL dropTimerActive;
NSPoint lastCursorPos; NSPoint lastCursorPos;
} }
@property (weak) IBOutlet NSMenuItem *updateMenuItem; @property (weak) IBOutlet NSMenuItem *updateMenuItem;
@ -1682,7 +1681,6 @@
[dropTimer invalidate]; [dropTimer invalidate];
} }
dropTimer = nil; dropTimer = nil;
dropTimerActive = NO;
} }
- (void)validateDrop:(NSWindow *)editorWindow { - (void)validateDrop:(NSWindow *)editorWindow {
@ -1694,23 +1692,20 @@
if (mainWindow && mainWindow.isVisible && !mainWindow.isMiniaturized) { if (mainWindow && mainWindow.isVisible && !mainWindow.isMiniaturized) {
self.dropEditorWindow = editorWindow; self.dropEditorWindow = editorWindow;
if (!dropTimer) {
dropTimer = [NSTimer timerWithTimeInterval:0.3
target:self
selector:@selector(handleDropTimer)
userInfo:nil
repeats:YES];
}
NSPoint pos = [NSEvent mouseLocation]; NSPoint pos = [NSEvent mouseLocation];
if ([titlebarController canPinTabAtPoint:pos]) { if ([titlebarController canPinTabAtPoint:pos]) {
if (!dropTimerActive) { if (!dropTimer) {
[[NSRunLoop currentRunLoop] addTimer:dropTimer forMode:NSRunLoopCommonModes]; dropTimer = [NSTimer scheduledTimerWithTimeInterval:0.15
dropTimerActive = YES; target:self
selector:@selector(handleDropTimer)
userInfo:nil
repeats:YES];
} }
lastCursorPos = pos; lastCursorPos = pos;
} else { } else {
[self stopDropTimer]; if (dropTimer) {
[self stopDropTimer];
}
} }
} }
} }