Revision: 23992
http://sourceforge.net/p/bibdesk/svn/23992
Author: hofman
Date: 2019-07-10 20:52:58 +0000 (Wed, 10 Jul 2019)
Log Message:
-----------
use cell to get size for text
Modified Paths:
--------------
trunk/bibdesk/BDSKAuthenticationController.m
trunk/bibdesk/BDSKDownloader.h
trunk/bibdesk/BDSKDownloader.m
Modified: trunk/bibdesk/BDSKAuthenticationController.m
===================================================================
--- trunk/bibdesk/BDSKAuthenticationController.m 2019-07-10 14:56:26 UTC
(rev 23991)
+++ trunk/bibdesk/BDSKAuthenticationController.m 2019-07-10 20:52:58 UTC
(rev 23992)
@@ -47,7 +47,7 @@
- (void)adjustSizeOfTextField:(NSTextField *)textField {
NSRect windowFrame = [[self window] frame];
NSRect frame = [textField frame];
- NSSize bestSize = [textField intrinsicContentSize];
+ NSSize bestSize = [[textField cell] cellSizeForBounds:NSMakeRect(0.0, 0.0,
NSWidth(frame), 10000.0)];
float heightDelta = bestSize.height - NSHeight(frame);
frame.size.height += heightDelta;
frame.origin.y -= heightDelta;
Modified: trunk/bibdesk/BDSKDownloader.h
===================================================================
--- trunk/bibdesk/BDSKDownloader.h 2019-07-10 14:56:26 UTC (rev 23991)
+++ trunk/bibdesk/BDSKDownloader.h 2019-07-10 20:52:58 UTC (rev 23992)
@@ -75,8 +75,8 @@
- (void)cleanupDownload:(BDSKDownload *)download;
-- (void)_download:(BDSKDownload *)download
decideDestinationWithSuggestedFilename:(NSString *)suggestedFileName
completionHandler:(void (^)(NSURL *destinationURL, BOOL
allowOverwrite))completionHandler;
-- (void)_download:(BDSKDownload *)download didCreateDestination:(NSURL
*)destinationURL;
+- (void)_download:(BDSKDownload *)download didFinishWithData:(NSData *)data;
+- (void)_download:(BDSKDownload *)download didFailWithError:(NSError *)error;
- (void)_download:(BDSKDownload *)download
didReceiveExpectedContentLength:(int64_t)expectedContentLength;
- (void)_download:(BDSKDownload *)download didReceiveData:(NSData *)data
ofLength:(uint64_t)length;
@@ -83,8 +83,8 @@
- (void)_download:(BDSKDownload *)download
didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
completionHandler:(void (^)(BDSKDownloaderAuthChallengeDisposition disposition,
NSURLCredential * credential))completionHandler;
-- (void)_download:(BDSKDownload *)download didFinishWithData:(NSData *)data;
-- (void)_download:(BDSKDownload *)download didFailWithError:(NSError *)error;
+- (void)_download:(BDSKDownload *)download
decideDestinationWithSuggestedFilename:(NSString *)suggestedFileName
completionHandler:(void (^)(NSURL *destinationURL, BOOL
allowOverwrite))completionHandler;
+- (void)_download:(BDSKDownload *)download didCreateDestination:(NSURL
*)destinationURL;
@end
@@ -110,24 +110,23 @@
@protocol BDSKDownloaderDelegate <NSObject>
+@required
+
+// data is nil for file downloads
+- (void)downloader:(BDSKDownloader *)downloader download:(BDSKDownload
*)download didFinishWithData:(NSData *)data;
+- (void)downloader:(BDSKDownloader *)downloader download:(BDSKDownload
*)download didFailWithError:(NSError *)error;
+
@optional
-// only for downloads
-- (void)downloader:(BDSKDownloader *)downloader download:(BDSKDownload
*)download decideDestinationWithSuggestedFilename:(NSString *)destinationName
completionHandler:(void (^)(NSURL *destinationURL, BOOL
allowOverwrite))completionHandler;
-- (void)downloader:(BDSKDownloader *)downloader download:(BDSKDownload
*)download didCreateDestination:(NSURL *)destinationURL;
-
-// for downloads and data
+// for file and data downloads
- (void)downloader:(BDSKDownloader *)downloader download:(BDSKDownload
*)download didReceiveExpectedContentLength:(int64_t)expectedContentLength;
- (void)downloader:(BDSKDownloader *)downloader download:(BDSKDownload
*)download didReceiveDataOfLength:(uint64_t)length;
-- (void)downloader:(BDSKDownloader *)downloader download:(BDSKDownload
*)download didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
completionHandler:(void (^)(BDSKDownloaderAuthChallengeDisposition disposition,
NSURLCredential * credential))completionHandler;
-
+- (void)downloader:(BDSKDownloader *)downloader download:(BDSKDownload
*)download didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
completionHandler:(void (^)(BDSKDownloaderAuthChallengeDisposition disposition,
NSURLCredential *credential))completionHandler;
- (NSWindow *)downloader:(BDSKDownloader *)downloader
downloadWindowForAuthenticationSheet:(BDSKDownload *)download;
-@required
+// only for file downloads
+- (void)downloader:(BDSKDownloader *)downloader download:(BDSKDownload
*)download decideDestinationWithSuggestedFilename:(NSString *)destinationName
completionHandler:(void (^)(NSURL *destinationURL, BOOL
allowOverwrite))completionHandler;
+- (void)downloader:(BDSKDownloader *)downloader download:(BDSKDownload
*)download didCreateDestination:(NSURL *)destinationURL;
-// data is nil for downloads
-- (void)downloader:(BDSKDownloader *)downloader download:(BDSKDownload
*)download didFinishWithData:(NSData *)data;
-- (void)downloader:(BDSKDownloader *)downloader download:(BDSKDownload
*)download didFailWithError:(NSError *)error;
-
@end
Modified: trunk/bibdesk/BDSKDownloader.m
===================================================================
--- trunk/bibdesk/BDSKDownloader.m 2019-07-10 14:56:26 UTC (rev 23991)
+++ trunk/bibdesk/BDSKDownloader.m 2019-07-10 20:52:58 UTC (rev 23992)
@@ -107,21 +107,14 @@
[downloads removeObjectForKey:task];
}
-- (void)_download:(BDSKDownload *)download
decideDestinationWithSuggestedFilename:(NSString *)suggestedFileName
completionHandler:(void (^)(NSURL *destinationURL, BOOL
allowOverwrite))completionHandler {
+- (void)_download:(BDSKDownload *)download didFinishWithData:(NSData *)data {
id<BDSKDownloaderDelegate> delegate = [download delegate];
- if ([delegate
respondsToSelector:@selector(downloader:download:decideDestinationWithSuggestedFilename:completionHandler:)])
{
- [delegate downloader:self download:download
decideDestinationWithSuggestedFilename:suggestedFileName
completionHandler:completionHandler];
- } else {
- NSURL *destinationURL = [[NSFileManager defaultManager]
temporaryFileURLWithBasename:suggestedFileName];
- completionHandler(destinationURL, YES);
- }
+ [delegate downloader:self download:download didFinishWithData:data];
}
-- (void)_download:(BDSKDownload *)download didCreateDestination:(NSURL
*)destinationURL {
+- (void)_download:(BDSKDownload *)download didFailWithError:(NSError *)error {
id<BDSKDownloaderDelegate> delegate = [download delegate];
- if ([delegate
respondsToSelector:@selector(downloader:download:didCreateDestination:)]) {
- [delegate downloader:self download:download
didCreateDestination:destinationURL];
- }
+ [delegate downloader:self download:download didFailWithError:error];
}
- (void)_download:(BDSKDownload *)download
didReceiveExpectedContentLength:(int64_t)expectedContentLength {
@@ -157,14 +150,21 @@
}
}
-- (void)_download:(BDSKDownload *)download didFinishWithData:(NSData *)data {
+- (void)_download:(BDSKDownload *)download
decideDestinationWithSuggestedFilename:(NSString *)suggestedFileName
completionHandler:(void (^)(NSURL *destinationURL, BOOL
allowOverwrite))completionHandler {
id<BDSKDownloaderDelegate> delegate = [download delegate];
- [delegate downloader:self download:download didFinishWithData:data];
+ if ([delegate
respondsToSelector:@selector(downloader:download:decideDestinationWithSuggestedFilename:completionHandler:)])
{
+ [delegate downloader:self download:download
decideDestinationWithSuggestedFilename:suggestedFileName
completionHandler:completionHandler];
+ } else {
+ NSURL *destinationURL = [[NSFileManager defaultManager]
temporaryFileURLWithBasename:suggestedFileName];
+ completionHandler(destinationURL, YES);
+ }
}
-- (void)_download:(BDSKDownload *)download didFailWithError:(NSError *)error {
+- (void)_download:(BDSKDownload *)download didCreateDestination:(NSURL
*)destinationURL {
id<BDSKDownloaderDelegate> delegate = [download delegate];
- [delegate downloader:self download:download didFailWithError:error];
+ if ([delegate
respondsToSelector:@selector(downloader:download:didCreateDestination:)]) {
+ [delegate downloader:self download:download
didCreateDestination:destinationURL];
+ }
}
@end
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
