fix: multi screen window show

Easydict/Feature/Utility/EZCoordinateUtils/EZCoordinateUtils.h

@@ -11,6 +11,8 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface EZCoordinateUtils : NSObject
+// record start query screen
+@property (nonatomic, strong, class, nullable) NSScreen *startQueryScreen;
 
 /// Get safe point, bottom-left coordinate.
 + (CGPoint)getFrameSafePoint:(CGRect)frame moveToPoint:(CGPoint)point inScreen:(NSScreen *)screen;

Easydict/Feature/Utility/EZCoordinateUtils/EZCoordinateUtils.m

@@ -7,9 +7,17 @@
 //
 
 #import "EZCoordinateUtils.h"
-
 @implementation EZCoordinateUtils
 
++ (void)setStartQueryScreen:(NSScreen *)startQueryScreen {
+ objc_setAssociatedObject(self, @selector(startQueryScreen), startQueryScreen, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
++ (NSScreen *)startQueryScreen {
+ return objc_getAssociatedObject(self, _cmd);
+}
+
+
 + (CGPoint)getFrameSafePoint:(CGRect)frame moveToPoint:(CGPoint)point inScreen:(NSScreen *)screen {
  CGRect newFrame = CGRectMake(point.x, point.y, frame.size.width, frame.size.height);
  return [self getSafeLocation:newFrame inScreen:screen];
@@ -30,7 +38,11 @@ + (CGPoint)getSafeLocation:(CGRect)frame inScreen:(NSScreen *)screen {
 /// Make sure frame show in screen visible frame, return left-bottom postion frame.
 + (CGRect)getSafeAreaFrame:(CGRect)frame inScreen:(nullable NSScreen *)screen {
  if (!screen) {
- screen = [self screenOfMousePosition];
+ if ([self startQueryScreen]) {
+ screen = [self startQueryScreen];
+ } else {
+ screen = [self screenOfMousePosition];
+ }
  }
  CGRect visibleFrame = screen.visibleFrame;
  if (CGRectContainsRect(visibleFrame, frame)) {

Easydict/Feature/ViewController/Window/BaseQueryWindow/EZBaseQueryViewController.m

@@ -398,6 +398,10 @@ - (void)startQueryText:(NSString *)text actionType:(EZActionType)actionType {
  return;
  }
 
+ // record current screen when start query
+ NSScreen *current = [EZCoordinateUtils screenForPoint: [NSEvent mouseLocation]];
+ EZCoordinateUtils.startQueryScreen = current;
+
  self.inputText = text;
  self.queryModel.actionType = actionType;
  self.queryView.isTypingChinese = NO;

Easydict/Feature/ViewController/Window/WindowManager/EZWindowManager.m

@@ -930,6 +930,9 @@ - (void)closeFloatingWindow {
  NSNumber *windowType = @(self.floatingWindowType);
  [self.floatingWindowTypeArray removeObject:windowType];
  [self.floatingWindowTypeArray insertObject:windowType atIndex:1];
+
+ // clear start quert screen
+ EZCoordinateUtils.startQueryScreen = nil;
 }
 
 /// Close floating window, except main window.