Revision: 14846
http://sourceforge.net/p/skim-app/code/14846
Author: hofman
Date: 2024-12-24 17:41:29 +0000 (Tue, 24 Dec 2024)
Log Message:
-----------
send columnDidResize notification instead of custom delegate method when
toggling table column of note outline view
Modified Paths:
--------------
trunk/SKMainWindowController_UI.h
trunk/SKMainWindowController_UI.m
trunk/SKNoteOutlineView.h
trunk/SKNoteOutlineView.m
trunk/SKNotesDocument.h
trunk/SKNotesDocument.m
Modified: trunk/SKMainWindowController_UI.h
===================================================================
--- trunk/SKMainWindowController_UI.h 2024-12-21 16:04:46 UTC (rev 14845)
+++ trunk/SKMainWindowController_UI.h 2024-12-24 17:41:29 UTC (rev 14846)
@@ -46,7 +46,7 @@
NS_ASSUME_NONNULL_BEGIN
-@interface SKMainWindowController (UI) <SKMainWindowDelegate,
SKTableViewDelegate, NSTableViewDataSource, SKOutlineViewDelegate,
SKNoteOutlineViewDelegate, NSOutlineViewDataSource, NSTextFieldDelegate,
SKNoteTypeSheetControllerDelegate, NSMenuDelegate>
+@interface SKMainWindowController (UI) <SKMainWindowDelegate,
SKTableViewDelegate, NSTableViewDataSource, SKOutlineViewDelegate,
NSOutlineViewDataSource, NSTextFieldDelegate,
SKNoteTypeSheetControllerDelegate, NSMenuDelegate>
- (void)registerForNotifications;
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2024-12-21 16:04:46 UTC (rev 14845)
+++ trunk/SKMainWindowController_UI.m 2024-12-24 17:41:29 UTC (rev 14846)
@@ -850,11 +850,6 @@
[self performSelectorOnce:@selector(resetNoteRowHeights)
afterDelay:0.0];
}
-- (void)outlineView:(NSOutlineView *)ov
didChangeHiddenOfTableColumn:(NSTableColumn *)tableColumn {
- if (mwcFlags.autoResizeNoteRows && [ov
isEqual:rightSideController.noteOutlineView])
- [self performSelectorOnce:@selector(resetNoteRowHeights)
afterDelay:0.0];
-}
-
- (void)outlineViewColumnDidMove:(NSNotification *)notification {
if ([[notification object] isEqual:rightSideController.noteOutlineView] &&
mwcFlags.autoResizeNoteRows) {
NSInteger oldColumn = [[[notification userInfo]
objectForKey:@"NSOldColumn"] integerValue];
Modified: trunk/SKNoteOutlineView.h
===================================================================
--- trunk/SKNoteOutlineView.h 2024-12-21 16:04:46 UTC (rev 14845)
+++ trunk/SKNoteOutlineView.h 2024-12-24 17:41:29 UTC (rev 14846)
@@ -41,13 +41,6 @@
NS_ASSUME_NONNULL_BEGIN
-@protocol SKNoteOutlineViewDelegate <SKOutlineViewDelegate>
-@optional
-
-- (void)outlineView:(NSOutlineView *)anOutlineView
didChangeHiddenOfTableColumn:(NSTableColumn *)aTableColumn;
-
-@end
-
@interface SKNoteOutlineView : SKOutlineView {
NSMapTable *rowHeights;
}
@@ -54,8 +47,6 @@
- (void)toggleTableColumn:(nullable id)sender;
-@property (nullable, weak) id<SKNoteOutlineViewDelegate> delegate;
-
@property (nonatomic, readonly) CGFloat fullWidthCellWidth;
@property (nonatomic, readonly) CGFloat outlineIndentation;
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2024-12-21 16:04:46 UTC (rev 14845)
+++ trunk/SKNoteOutlineView.m 2024-12-24 17:41:29 UTC (rev 14846)
@@ -153,8 +153,10 @@
[tc setHidden:[tc isHidden] == NO];
if ([self outlineTableColumn] == tc && [tc isHidden])
[self collapseItem:nil collapseChildren:YES];
- if ([[self delegate]
respondsToSelector:@selector(outlineView:didChangeHiddenOfTableColumn:)])
- [[self delegate] outlineView:self didChangeHiddenOfTableColumn:tc];
+ NSNotification *notification = [NSNotification
notificationWithName:NSOutlineViewColumnDidResizeNotification object:self
userInfo:@{@"TableColumn":tc}];
+ if ([[self delegate]
respondsToSelector:@selector(outlineViewColumnDidResize:)])
+ [[self delegate] outlineViewColumnDidResize:notification];
+ [[NSNotificationCenter defaultCenter] postNotification:notification];
}
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
@@ -225,9 +227,4 @@
}
}
-#pragma mark Delegate
-
-- (id <SKNoteOutlineViewDelegate>)delegate { return (id
<SKNoteOutlineViewDelegate>)[super delegate]; }
-- (void)setDelegate:(id <SKNoteOutlineViewDelegate>)newDelegate { [super
setDelegate:newDelegate]; }
-
@end
Modified: trunk/SKNotesDocument.h
===================================================================
--- trunk/SKNotesDocument.h 2024-12-21 16:04:46 UTC (rev 14845)
+++ trunk/SKNotesDocument.h 2024-12-24 17:41:29 UTC (rev 14846)
@@ -46,7 +46,7 @@
@class SKNoteOutlineView, SKStatusBar;
-@interface SKNotesDocument : NSDocument <NSWindowDelegate, NSToolbarDelegate,
SKNoteOutlineViewDelegate, NSOutlineViewDataSource,
SKNoteTypeSheetControllerDelegate> {
+@interface SKNotesDocument : NSDocument <NSWindowDelegate, NSToolbarDelegate,
NSOutlineViewDataSource, SKNoteTypeSheetControllerDelegate> {
SKNoteOutlineView *outlineView;
NSArrayController *arrayController;
NSSearchField *searchField;
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2024-12-21 16:04:46 UTC (rev 14845)
+++ trunk/SKNotesDocument.m 2024-12-24 17:41:29 UTC (rev 14846)
@@ -749,11 +749,6 @@
}
}
-- (void)outlineView:(NSOutlineView *)ov
didChangeHiddenOfTableColumn:(NSTableColumn *)tableColumn {
- if (ndFlags.autoResizeRows)
- [self performSelectorOnce:@selector(resetRowHeights) afterDelay:0.0];
-}
-
- (void)outlineView:(NSOutlineView *)ov copyItems:(NSArray *)items {
NSPasteboard *pboard = [NSPasteboard generalPasteboard];
NSMutableArray *copiedItems = [NSMutableArray array];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
