skim-app-commit Mailing List for Skim (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 15732
          http://sourceforge.net/p/skim-app/code/15732
Author:   hofman
Date:     2025-10-30 10:27:01 +0000 (Thu, 30 Oct 2025)
Log Message:
-----------
allow typing a space when in the middle of type select, don't scroll or quicklook in this case

Modified Paths:
--------------
    trunk/SKOutlineView.m
    trunk/SKTableView.m
    trunk/SKTypeSelectHelper.h
    trunk/SKTypeSelectHelper.m

Modified: trunk/SKOutlineView.m
===================================================================

--- trunk/SKOutlineView.m	2025-10-29 15:40:53 UTC (rev 15731)
+++ trunk/SKOutlineView.m	2025-10-30 10:27:01 UTC (rev 15732)
@@ -111,7 +111,7 @@
     if ((eventChar == NSNewlineCharacter || eventChar == NSEnterCharacter || eventChar == NSCarriageReturnCharacter) && modifierFlags == 0) {
         if ([self doubleAction] == NULL || [self sendAction:[self doubleAction] to:[self target]] == NO)
             NSBeep();
-    } else if ((eventChar == SKSpaceCharacter) && modifierFlags == 0) {
+    } else if ((eventChar == SKSpaceCharacter) && modifierFlags == 0 && [typeSelectHelper isProcessing] == NO) {
         if (supportsQuickLook == NO)
             [[self enclosingScrollView] pageDown:nil];
         else if ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible])

Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m	2025-10-29 15:40:53 UTC (rev 15731)
+++ trunk/SKTableView.m	2025-10-30 10:27:01 UTC (rev 15732)
@@ -91,7 +91,7 @@
             NSBeep();
     } else if ((eventChar == NSDeleteCharacter || eventChar == NSDeleteFunctionKey) && modifierFlags == 0 && [self canDelete]) {
         [self delete:self];
-    } else if ((eventChar == SKSpaceCharacter) && modifierFlags == 0) {
+    } else if ((eventChar == SKSpaceCharacter) && modifierFlags == 0 && [typeSelectHelper isProcessing] == NO) {
         if (supportsQuickLook == NO)
             [[self enclosingScrollView] pageDown:nil];
         else if ([[self delegate] respondsToSelector:@selector(tableViewQuickLookPreviewItems:)])

Modified: trunk/SKTypeSelectHelper.h
===================================================================
--- trunk/SKTypeSelectHelper.h	2025-10-29 15:40:53 UTC (rev 15731)
+++ trunk/SKTypeSelectHelper.h	2025-10-30 10:27:01 UTC (rev 15732)
@@ -51,7 +51,7 @@
 @interface SKTypeSelectHelper : NSObject <NSTextViewDelegate> {
     __weak id <SKTypeSelectDelegate> delegate;
     SKTypeSelectMatchOption matchOption;
-    BOOL isProcessing;
+    BOOL processing;
     NSArray<NSString *> *searchCache;
     NSString *searchString;
     NSTimer *timer;
@@ -70,6 +70,8 @@
 
 - (BOOL)handleEvent:(NSEvent *)keyEvent;
 
+@property (readonly, getter=isProcessing) BOOL processing;
+
 @end
 
 

Modified: trunk/SKTypeSelectHelper.m
===================================================================
--- trunk/SKTypeSelectHelper.m	2025-10-29 15:40:53 UTC (rev 15731)
+++ trunk/SKTypeSelectHelper.m	2025-10-30 10:27:01 UTC (rev 15732)
@@ -69,6 +69,7 @@
 
 @implementation SKTypeSelectHelper
 
+@synthesize processing;
 @dynamic delegate, matchOption;
 
 static NSCharacterSet *nonAlphanumericCharacterSet = nil;
@@ -93,7 +94,7 @@
         searchCache = nil;
         searchString = nil;
         matchOption = aMatchOption;
-        isProcessing = NO;
+        processing = NO;
         timer = nil;
         observedWindow = nil;
     }
@@ -173,7 +174,7 @@
 - (void)searchWithEvent:(NSEvent *)keyEvent {
     NSTextView *editor = [self editor];
     
-    if (isProcessing == NO) {
+    if (processing == NO) {
         [[NSNotificationCenter defaultCenter] removeObserver:self];
         if ([[NSApp keyWindow] isSheet])
             [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(typeSelectCleanTimeout:) name:NSWindowDidEndSheetNotification object:[NSApp keyWindow]];
@@ -210,9 +211,9 @@
     [self startTimerWithBlock:^(NSTimer *aTimer){ [weakSelf typeSelectSearchTimeout:aTimer]; }];
     
     if (matchOption != SKFullStringMatch)
-        [self searchWithStickyMatch:isProcessing];
+        [self searchWithStickyMatch:processing];
     
-    isProcessing = YES;
+    processing = YES;
 }
 
 - (void)repeatSearch {
@@ -224,7 +225,7 @@
     __weak SKTypeSelectHelper *weakSelf = self;
     [self startTimerWithBlock:^(NSTimer *aTimer){ [weakSelf typeSelectCleanTimeout:timer]; }];
     
-    isProcessing = NO;
+    processing = NO;
 }
 
 - (void)cancelSearch {
@@ -236,7 +237,7 @@
     if ([keyEvent deviceIndependentModifierFlags] & ~NSEventModifierFlagShift & ~NSEventModifierFlagOption & ~NSEventModifierFlagCapsLock & ~NSEventModifierFlagNumericPad)
         return NO;
     
-    NSCharacterSet *invalidCharacters = isProcessing ? [NSCharacterSet controlCharacterSet] : nonAlphanumericCharacterSet;
+    NSCharacterSet *invalidCharacters = processing ? [NSCharacterSet controlCharacterSet] : nonAlphanumericCharacterSet;
     
     return [[keyEvent characters] rangeOfCharacterFromSet:invalidCharacters].location == NSNotFound;
 }
@@ -246,7 +247,7 @@
 }
 
 - (BOOL)isCancelEvent:(NSEvent *)keyEvent {
-    return isProcessing && [keyEvent deviceIndependentModifierFlags] == 0 && [keyEvent firstCharacter] == CANCEL_CHARACTER;
+    return processing && [keyEvent deviceIndependentModifierFlags] == 0 && [keyEvent firstCharacter] == CANCEL_CHARACTER;
 }
 
 // See http://www.mactech.com/articles/mactech/Vol.18/18.10/1810TableTechniques/index.html
@@ -285,7 +286,7 @@
     [self updateSearchString:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [self stopTimer];
-    isProcessing = NO;
+    processing = NO;
     
     NSText *editor = [self editor];
     if ([editor delegate] == self)

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





2007	Jan	Feb	Mar (23)	Apr (254)	May (252)	Jun (209)	Jul (198)	Aug (192)	Sep (207)	Oct (120)	Nov (179)	Dec (52)
2008	Jan (48)	Feb (69)	Mar (129)	Apr (250)	May (113)	Jun (177)	Jul (228)	Aug (155)	Sep (218)	Oct (185)	Nov (109)	Dec (88)
2009	Jan (83)	Feb (39)	Mar (70)	Apr (47)	May (48)	Jun (67)	Jul (61)	Aug (97)	Sep (221)	Oct (141)	Nov (70)	Dec (61)
2010	Jan (45)	Feb (76)	Mar (178)	Apr (106)	May (57)	Jun (32)	Jul (64)	Aug (98)	Sep (96)	Oct (19)	Nov (34)	Dec (117)
2011	Jan (55)	Feb (48)	Mar (64)	Apr (21)	May (39)	Jun (53)	Jul (99)	Aug (56)	Sep (39)	Oct (26)	Nov (19)	Dec (69)
2012	Jan (17)	Feb (40)	Mar (17)	Apr	May (2)	Jun (8)	Jul (2)	Aug (10)	Sep (10)	Oct (38)	Nov (48)	Dec (70)
2013	Jan (43)	Feb (47)	Mar (39)	Apr (37)	May (25)	Jun (6)	Jul (20)	Aug (49)	Sep (33)	Oct (34)	Nov (75)	Dec (6)
2014	Jan (32)	Feb (10)	Mar (17)	Apr	May	Jun (26)	Jul (5)	Aug	Sep (4)	Oct (23)	Nov (80)	Dec (48)
2015	Jan (80)	Feb (50)	Mar (58)	Apr (20)	May (11)	Jun (16)	Jul (24)	Aug (27)	Sep (56)	Oct (30)	Nov (16)	Dec (6)
2016	Jan (31)	Feb (14)	Mar (23)	Apr (17)	May (40)	Jun (12)	Jul (17)	Aug (9)	Sep (32)	Oct (36)	Nov (23)	Dec (9)
2017	Jan (37)	Feb (23)	Mar (65)	Apr (22)	May (6)	Jun (3)	Jul	Aug	Sep (3)	Oct (22)	Nov (63)	Dec (71)
2018	Jan (83)	Feb (21)	Mar (35)	Apr (44)	May (14)	Jun (12)	Jul (8)	Aug (18)	Sep (10)	Oct (145)	Nov (144)	Dec (76)
2019	Jan (18)	Feb (28)	Mar (5)	Apr (208)	May (291)	Jun (158)	Jul (27)	Aug (8)	Sep (10)	Oct (83)	Nov (41)	Dec (31)
2020	Jan (16)	Feb (46)	Mar (100)	Apr (78)	May (69)	Jun (71)	Jul (28)	Aug (131)	Sep (176)	Oct (89)	Nov (147)	Dec (19)
2021	Jan (19)	Feb (25)	Mar (91)	Apr (98)	May (14)	Jun (44)	Jul (8)	Aug (3)	Sep (38)	Oct (57)	Nov (97)	Dec (74)
2022	Jan (89)	Feb (47)	Mar (15)	Apr (50)	May (54)	Jun (56)	Jul (80)	Aug (12)	Sep (11)	Oct (60)	Nov (48)	Dec (4)
2023	Jan (75)	Feb (49)	Mar (84)	Apr (24)	May (13)	Jun (74)	Jul (32)	Aug (66)	Sep (50)	Oct (38)	Nov (105)	Dec (181)
2024	Jan (21)	Feb (49)	Mar (77)	Apr (84)	May (20)	Jun (71)	Jul (53)	Aug (33)	Sep (54)	Oct (124)	Nov (151)	Dec (73)
2025	Jan (61)	Feb (17)	Mar (136)	Apr (72)	May (200)	Jun (238)	Jul (91)	Aug (8)	Sep	Oct (63)	Nov (42)	Dec

skim-app-commit Mailing List for Skim (Page 3)

A PDF Reader and Note-taker for OS X

skim-app-commit — This tracks source code changes in Subversion.