Revision: 27786
http://sourceforge.net/p/bibdesk/svn/27786
Author: hofman
Date: 2022-08-10 15:37:01 +0000 (Wed, 10 Aug 2022)
Log Message:
-----------
use history itwm icon on 10.12-, otherwise use cached icon or Bookmark image
Modified Paths:
--------------
trunk/bibdesk/BDSKAppController.m
trunk/bibdesk/BDSKWebGroupViewController.m
Modified: trunk/bibdesk/BDSKAppController.m
===================================================================
--- trunk/bibdesk/BDSKAppController.m 2022-08-10 09:14:35 UTC (rev 27785)
+++ trunk/bibdesk/BDSKAppController.m 2022-08-10 15:37:01 UTC (rev 27786)
@@ -600,7 +600,7 @@
}
NSMenuItem *item = [menu addItemWithTitle:title
action:@selector(openBookmark:) keyEquivalent:@""];
[item setRepresentedObject:[NSURL URLWithString:[historyItem
URLString]]];
- [item setImageAndSize:[[BDSKWebIconDatabase sharedDatabase]
iconForURLString:[historyItem URLString]] ?: [NSImage imageNamed:@"Bookmark"]];
+ [item setImageAndSize:RUNNING_BEFORE(10_13) ? [historyItem icon] :
([[BDSKWebIconDatabase sharedDatabase] iconForURLString:[historyItem
URLString]] ?: [NSImage imageNamed:@"Bookmark"])];
}
}
Modified: trunk/bibdesk/BDSKWebGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.m 2022-08-10 09:14:35 UTC (rev
27785)
+++ trunk/bibdesk/BDSKWebGroupViewController.m 2022-08-10 15:37:01 UTC (rev
27786)
@@ -206,7 +206,7 @@
title = [url isFileURL] ? [[url path] lastPathComponent] : [[url
absoluteString] stringByRemovingPercentEncoding];
}
NSMenuItem *menuItem = [menu addItemWithTitle:title
action:@selector(goBackForwardInHistory:) keyEquivalent:@""];
- [menuItem setImageAndSize:[[BDSKWebIconDatabase sharedDatabase]
iconForURLString:[item URLString]] ?: [item icon]];
+ [menuItem setImageAndSize:RUNNING_BEFORE(10_13) ? [item icon] :
([[BDSKWebIconDatabase sharedDatabase] iconForURLString:[item URLString]] ?:
[NSImage imageNamed:@"Bookmark"])];
[menuItem setTarget:self];
[menuItem setRepresentedObject:item];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
