Revision: 23804 http://sourceforge.net/p/bibdesk/svn/23804 Author: hofman Date: 2019-05-10 14:04:49 +0000 (Fri, 10 May 2019) Log Message: ----------- remove scrubber forward declarations
Modified Paths: -------------- trunk/bibdesk/NSTouchBar_BDSKForwardDeclarations.h Modified: trunk/bibdesk/NSTouchBar_BDSKForwardDeclarations.h =================================================================== --- trunk/bibdesk/NSTouchBar_BDSKForwardDeclarations.h 2019-05-10 09:30:35 UTC (rev 23803) +++ trunk/bibdesk/NSTouchBar_BDSKForwardDeclarations.h 2019-05-10 14:04:49 UTC (rev 23804) @@ -47,18 +47,6 @@ @protocol NSTouchBarDelegate; -@class NSScrubber; -@class NSScrubberItemView; -@class NSScrubberTextItemView; -@class NSScrubberImageItemView; -@class NSScrubberSelectionView; -@class NSScrubberLayout; -@class NSScrubberFlowLayout; -@class NSScrubberProportionalLayout; - -@protocol NSScrubberDelegate; -@protocol NSScrubberDataSource; - @interface NSTouchBar : NSObject <NSCoding> - (id)init; @@ -150,160 +138,6 @@ #define NSTouchBarItemIdentifierFlexibleSpace @"NSTouchBarItemIdentifierFlexibleSpace" -typedef NS_ENUM(NSInteger, NSScrubberMode) { - NSScrubberModeFixed = 0, - NSScrubberModeFree -}; - -typedef NS_ENUM(NSInteger, NSScrubberAlignment) { - NSScrubberAlignmentNone = 0, - NSScrubberAlignmentLeading, - NSScrubberAlignmentTrailing, - NSScrubberAlignmentCenter -}; - -@interface NSScrubberSelectionStyle : NSObject <NSCoding> - -@property (class, strong, readonly) NSScrubberSelectionStyle *outlineOverlayStyle; -@property (class, strong, readonly) NSScrubberSelectionStyle *roundedBackgroundStyle; - -- (NSScrubberSelectionView *)makeSelectionView; - -@end - -@interface NSScrubber : NSView - -@property (weak) id<NSScrubberDataSource> dataSource; -@property (weak) id<NSScrubberDelegate> delegate; -@property (strong) NSScrubberLayout *scrubberLayout; -@property (readonly) NSInteger numberOfItems; -@property (readonly) NSInteger highlightedIndex; -@property NSInteger selectedIndex; -@property NSScrubberMode mode; -@property NSScrubberAlignment itemAlignment; -@property (getter=isContinuous) BOOL continuous; -@property BOOL floatsSelectionViews; -@property (strong) NSScrubberSelectionStyle *selectionBackgroundStyle; -@property (strong) NSScrubberSelectionStyle *selectionOverlayStyle; -@property BOOL showsArrowButtons; -@property BOOL showsAdditionalContentIndicators; -@property (copy) NSColor *backgroundColor; -@property (strong) NSView *backgroundView; - -- (void)reloadData; -- (void)performSequentialBatchUpdates:(void(^)(void))updateBlock; -- (void)insertItemsAtIndexes:(NSIndexSet *)indexes; -- (void)removeItemsAtIndexes:(NSIndexSet *)indexes; -- (void)reloadItemsAtIndexes:(NSIndexSet *)indexes; -- (void)moveItemAtIndex:(NSInteger)oldIndex toIndex:(NSInteger)newIndex; -- (void)scrollItemAtIndex:(NSInteger)index toAlignment:(NSScrubberAlignment)alignment; - -- (NSScrubberItemView *)itemViewForItemAtIndex:(NSInteger)index; -- (void)registerClass:(Class)itemViewClass forItemIdentifier:(NSUserInterfaceItemIdentifier)itemIdentifier; -- (void)registerNib:(NSNib *)nib forItemIdentifier:(NSUserInterfaceItemIdentifier)itemIdentifier; -- (NSScrubberItemView *)makeItemWithIdentifier:(NSUserInterfaceItemIdentifier)itemIdentifier owner:(id)owner; - -@end - -@protocol NSScrubberDataSource <NSObject> -@required -- (NSInteger)numberOfItemsForScrubber:(NSScrubber *)scrubber; -- (NSScrubberItemView *)scrubber:(NSScrubber *)scrubber viewForItemAtIndex:(NSInteger)index; -@end - -@protocol NSScrubberDelegate <NSObject> -@optional -- (void)scrubber:(NSScrubber *)scrubber didSelectItemAtIndex:(NSInteger)selectedIndex; -- (void)scrubber:(NSScrubber *)scrubber didHighlightItemAtIndex:(NSInteger)highlightedIndex; -- (void)scrubber:(NSScrubber *)scrubber didChangeVisibleRange:(NSRange)visibleRange; -- (void)didBeginInteractingWithScrubber:(NSScrubber *)scrubber; -- (void)didFinishInteractingWithScrubber:(NSScrubber *)scrubber; -- (void)didCancelInteractingWithScrubber:(NSScrubber *)scrubber; -@end - -@interface NSScrubberArrangedView : NSView -@property (getter=isSelected) BOOL selected; -@property (getter=isHighlighted) BOOL highlighted; - -- (void)applyLayoutAttributes:(NSScrubberLayoutAttributes *)layoutAttributes; - -@end - -@interface NSScrubberItemView : NSScrubberArrangedView -@end - -@interface NSScrubberTextItemView : NSScrubberItemView - -@property (strong, readonly) NSTextField *textField; -@property (copy) NSString *title; - -@end - -@interface NSScrubberImageItemView : NSScrubberItemView - -@property (strong, readonly) NSImageView *imageView; -@property (copy) NSImage *image; -@property NSImageAlignment imageAlignment; - -@end - -@interface NSScrubberLayoutAttributes : NSObject - -@property NSInteger itemIndex; -@property NSRect frame; -@property CGFloat alpha; - -+ (id)layoutAttributesForItemAtIndex:(NSInteger)index; - -@end - -@interface NSScrubberLayout : NSObject <NSCoding> - -@property (class, readonly) Class layoutAttributesClass; -@property (weak, readonly) NSScrubber *scrubber; -@property (readonly) NSRect visibleRect; - -- (void)invalidateLayout; - -- (void)prepareLayout; - -@property (readonly) NSSize scrubberContentSize; - -- (NSScrubberLayoutAttributes *)layoutAttributesForItemAtIndex:(NSInteger)index; - -- (NSSet *)layoutAttributesForItemsInRect:(NSRect)rect; - -@property (readonly) BOOL shouldInvalidateLayoutForSelectionChange; -@property (readonly) BOOL shouldInvalidateLayoutForHighlightChange; - -- (BOOL)shouldInvalidateLayoutForChangeFromVisibleRect:(NSRect)fromVisibleRect toVisibleRect:(NSRect)toVisibleRect; - -@property (readonly) BOOL automaticallyMirrorsInRightToLeftLayout; - -@end - -@protocol NSScrubberFlowLayoutDelegate <NSScrubberDelegate> -@optional -- (NSSize)scrubber:(NSScrubber *)scrubber layout:(NSScrubberFlowLayout *)layout sizeForItemAtIndex:(NSInteger)itemIndex; -@end - -@interface NSScrubberFlowLayout : NSScrubberLayout - -@property CGFloat itemSpacing; -@property NSSize itemSize; - -- (void)invalidateLayoutForItemsAtIndexes:(NSIndexSet *)invalidItemIndexes; - -@end - -@interface NSScrubberProportionalLayout : NSScrubberLayout - -@property NSInteger numberOfVisibleItems; - -- (id)initWithNumberOfVisibleItems:(NSInteger)numberOfVisibleItems; - -@end - #else // When compiling against the 10.12.1 SDK or later, just provide forward @@ -316,16 +150,4 @@ @protocol NSTouchBarDelegate; -@class NSScrubber; -@class NSScrubberItemView; -@class NSScrubberTextItemView; -@class NSScrubberImageItemView; -@class NSScrubberSelectionView; -@class NSScrubberLayout; -@class NSScrubberFlowLayout; -@class NSScrubberProportionalLayout; - -@protocol NSScrubberDelegate; -@protocol NSScrubberDataSource; - #endif 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