Skip to content

Commit

Permalink
remove private apis (#3002)
Browse files Browse the repository at this point in the history
* Remove the private APIs entirely

This removes `CGSPrivate.h`, `CPSPrivate.h`, as well as
`QSCGSTransition.{h,m}` which only seemed to serve as adapters for them.
It additionally either removes entirely or comments out (to serve as a
quick and dirty reference for reimplementation) code that depended on
these files.

This will break the pretty animations.

See also: #3001

* Revert "#FIXME: Force-disable superfluous effects on startup"

This reverts commit a5640c6.

* Cleanup unused

* Remove references to flare
  • Loading branch information
n8henrie authored Mar 30, 2024
1 parent 77956ac commit 04d4d4c
Show file tree
Hide file tree
Showing 21 changed files with 11 additions and 854 deletions.
7 changes: 0 additions & 7 deletions Quicksilver/Code-App/QSApp.m
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ +(void)load {
setenv("QSDebugCatalog", "1", YES);
}
#endif
// #TODO @n8henrie: Hopefully temporary workaround for Sonoma
// https://github.com/quicksilver/Quicksilver/issues/2962
if (@available(macOS 14, *)) {
NSLog(@"Force-disabling superfluous effects at startup");
[[NSUserDefaults standardUserDefaults] setBool:false forKey:kUseEffects];
}

}

+ (void)initialize {
Expand Down
2 changes: 1 addition & 1 deletion Quicksilver/Code-App/QSController.m
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ - (void)animationDidEnd:(NSAnimation *)animation {

- (void)hideSplash:sender {
if (splashWindow) {
[splashWindow flare:self];
// [splashWindow flare:self];
[splashWindow close];
splashWindow = nil;
}
Expand Down
12 changes: 0 additions & 12 deletions Quicksilver/Code-App/QSSimpleNotifier.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
#import "QSBackgroundView.h"
#import "QSWindow.h"
#import "NSColor_QSModifications.h"
#import "QSCGSTransition.h"

#import "QSWindowAnimation.h"

#import <QSFoundation/QSFoundation.h>
Expand All @@ -36,16 +34,11 @@ - (id)init {
- (void)hideWindow:(NSWindow *)window early:(BOOL)early {

if (early) {
//[window setShowEffect:[NSDictionary dictionaryWithObjectsAndKeys:@"QSExtraExtraEffect", @"transformFn", @"show", @"type", nil]];
[(QSWindow *)window performEffect:[NSDictionary dictionaryWithObjectsAndKeys:@"0.25", @"duration", @"QSPurgeEffect", @"transformFn", @"visible", @"type", nil]];
[(QSWindow *)window reallyOrderOut:self];

//[[QSWindowAnimation helper] flipHide:window];
} else {
[(QSWindow *)window performEffect:[NSDictionary dictionaryWithObjectsAndKeys:@"0.25", @"duration", @"QSShrinkEffect", @"transformFn", @"hide", @"type", nil]];

[(QSWindow *)window reallyOrderOut:self];

}
[window close];
}
Expand Down Expand Up @@ -154,15 +147,10 @@ - (void)mainThreadDisplayNotificationWithAttributes:(NSDictionary *)attributes {
}

[self setThisTitle:titleString];
//
//[window pulse:self];

curTimer = [NSTimer scheduledTimerWithTimeInterval:2.0 target:self selector:@selector(hideNotification:) userInfo:window repeats:NO];

[[NSRunLoop currentRunLoop] addTimer:curTimer forMode:NSModalPanelRunLoopMode];
// [attributes objectForKey:QSNotifierTitle] , GROWL_NOTIFICATION_TITLE,
// [attributes objectForKey:QSNotifierText] , GROWL_NOTIFICATION_DESCRIPTION,
// [[attributes objectForKey:QSNotifierIcon] TIFFRepresentation] , GROWL_NOTIFICATION_ICON,
}
- (void)hideNotification:(NSTimer *)timer {
NSWindow *window = [timer userInfo];
Expand Down
246 changes: 0 additions & 246 deletions Quicksilver/Code-External/CGSPrivate.h

This file was deleted.

Loading

0 comments on commit 04d4d4c

Please sign in to comment.