[Skim-app-commit] SF.net SVN: skim-app:[15140] trunk

[hofman--- via Skim-app-commit]

Revision: 15140
          http://sourceforge.net/p/skim-app/code/15140
Author:   hofman
Date:     2025-05-02 08:45:04 +0000 (Fri, 02 May 2025)
Log Message:
-----------
use the context to decide whether async generated tool tip image should be shown

Modified Paths:
--------------
    trunk/SKImageToolTipWindow.h
    trunk/SKImageToolTipWindow.m

Modified: trunk/SKImageToolTipWindow.h
===================================================================
--- trunk/SKImageToolTipWindow.h        2025-05-01 22:20:41 UTC (rev 15139)
+++ trunk/SKImageToolTipWindow.h        2025-05-02 08:45:04 UTC (rev 15140)
@@ -47,8 +47,6 @@
     NSPoint point;
     CGFloat scale;
     NSImageView *imageView;
-    NSInteger currentRequest;
-    BOOL generatingRequest;
 }
 
 @property (class, nonatomic, readonly) SKImageToolTipWindow 
*sharedToolTipWindow;

Modified: trunk/SKImageToolTipWindow.m
===================================================================
--- trunk/SKImageToolTipWindow.m        2025-05-01 22:20:41 UTC (rev 15139)
+++ trunk/SKImageToolTipWindow.m        2025-05-02 08:45:04 UTC (rev 15140)
@@ -109,11 +109,6 @@
 }
 
 - (void)orderOut:(id)sender {
-    // ignore any currently generating image
-    if (generatingRequest) {
-        ++currentRequest;
-        generatingRequest = NO;
-    }
     context = nil;
     point = NSZeroPoint;
     [super orderOut:sender];
@@ -121,10 +116,6 @@
 
 - (void)fadeOut {
     // ignore any currently generating image
-    if (generatingRequest) {
-        ++currentRequest;
-        generatingRequest = NO;
-    }
     context = nil;
     point = NSZeroPoint;
     [super fadeOut];
@@ -131,11 +122,6 @@
 }
 
 - (void)showDelayed {
-    if (generatingRequest)
-        ++currentRequest;
-    generatingRequest = YES;
-    
-    NSInteger myRequest = currentRequest;
     id<SKImageToolTipContext> theContext = context;
     NSNumber *usedScaleNumber = [[NSUserDefaults standardUserDefaults] 
objectForKey:SKToolTipScaleKey];
     CGFloat usedScale = [usedScaleNumber 
respondsToSelector:@selector(doubleValue)] ? [usedScaleNumber doubleValue] : 
DEFAULT_SCALE;
@@ -148,9 +134,8 @@
         
         dispatch_async(dispatch_get_main_queue(), ^{
             // check if another image is enerated or we are fading out
-            if (myRequest != currentRequest)
+            if (theContext != context)
                 return;
-            generatingRequest = NO;
             
             if (image) {
                 BOOL isOpaque = [[[image representations] firstObject] 
isOpaque];

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit