[Skim-app-commit] SF.net SVN: skim-app:[12747] trunk

[hofman--- via Skim-app-commit]

Revision: 12747
          http://sourceforge.net/p/skim-app/code/12747
Author:   hofman
Date:     2022-01-26 15:59:47 +0000 (Wed, 26 Jan 2022)
Log Message:
-----------
Only row that is resized changes row height

Modified Paths:
--------------
    trunk/SKMainWindowController_UI.m
    trunk/SKNoteOutlineView.m
    trunk/SKNotesDocument.m

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2022-01-25 10:34:28 UTC (rev 12746)
+++ trunk/SKMainWindowController_UI.m   2022-01-26 15:59:47 UTC (rev 12747)
@@ -755,11 +755,10 @@
         SKNoteTableRowView *noteRowView = [rowView 
isKindOfClass:[SKNoteTableRowView class]] ? (SKNoteTableRowView *)rowView : nil;
         id item = [ov itemAtRow:row];
         if ([(PDFAnnotation *)item type] == nil) {
-            NSRect frame = [ov convertRect:[ov frameOfCellAtColumn:-1 row:row] 
toView:rowView];
             NSTableCellView *view = [ov makeViewWithIdentifier:NOTE_COLUMNID 
owner:self];
             [view setObjectValue:item];
             [[view textField] setEditable:NO];
-            [view setFrame:frame];
+            [view setFrame:[ov convertRect:[ov frameOfCellAtColumn:-1 row:row] 
toView:rowView]];
             [rowView addSubview:view];
             [noteRowView setRowCellView:view];
         }
@@ -870,10 +869,8 @@
             SKNoteOutlineView *ov = [notification object];
             [ov enumerateAvailableRowViewsUsingBlock:^(SKNoteTableRowView 
*rowView, NSInteger row){
                 NSTableCellView *rowCellView = [rowView rowCellView];
-                if (rowCellView) {
-                    NSRect frame = [ov convertRect:[ov frameOfCellAtColumn:-1 
row:row] toView:rowView];
-                    [rowCellView setFrame:frame];
-                }
+                if (rowCellView)
+                    [rowCellView setFrame:[ov convertRect:[ov 
frameOfCellAtColumn:-1 row:row] toView:rowView]];
             }];
             if (mwcFlags.autoResizeNoteRows)
                 [self performSelectorOnce:@selector(resetNoteRowHeights) 
afterDelay:0.0];

Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m   2022-01-25 10:34:28 UTC (rev 12746)
+++ trunk/SKNoteOutlineView.m   2022-01-26 15:59:47 UTC (rev 12747)
@@ -117,7 +117,7 @@
                     if ([theEvent type] == NSLeftMouseDragged) {
                         CGFloat currentHeight = fmax([self rowHeight], 
round(startHeight + [theEvent locationInView:self].y - mouseLoc.y));
                         [[self delegate] outlineView:self 
setHeight:currentHeight ofRowByItem:item];
-                        [self noteHeightOfRowsChangedAnimating:NO];
+                        [self noteHeightOfRowChanged:row animating:NO];
                     }
                 }
                 

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m     2022-01-25 10:34:28 UTC (rev 12746)
+++ trunk/SKNotesDocument.m     2022-01-26 15:59:47 UTC (rev 12747)
@@ -697,10 +697,9 @@
     SKNoteTableRowView *noteRowView = [rowView 
isKindOfClass:[SKNoteTableRowView class]] ? (SKNoteTableRowView *)rowView : nil;
     id item = [ov itemAtRow:row];
     if ([(PDFAnnotation *)item type] == nil) {
-        NSRect frame = [outlineView convertRect:[outlineView 
frameOfCellAtColumn:-1 row:row] toView:rowView];
         NSTableCellView *view = [ov makeViewWithIdentifier:NOTE_COLUMNID 
owner:self];
         [view setObjectValue:item];
-        [view setFrame:frame];
+        [view setFrame:[outlineView convertRect:[outlineView 
frameOfCellAtColumn:-1 row:row] toView:rowView]];
         [rowView addSubview:view];
         [noteRowView setRowCellView:view];
     }
@@ -768,10 +767,8 @@
     if (oldColumn == 0 || newColumn == 0) {
         [outlineView enumerateAvailableRowViewsUsingBlock:^(SKNoteTableRowView 
*rowView, NSInteger row){
             NSTableCellView *rowCellView = [rowView rowCellView];
-            if (rowCellView) {
-                NSRect frame = [outlineView convertRect:[outlineView 
frameOfCellAtColumn:-1 row:row] toView:rowView];
-                [rowCellView setFrame:frame];
-            }
+            if (rowCellView)
+                [rowCellView setFrame:[outlineView convertRect:[outlineView 
frameOfCellAtColumn:-1 row:row] toView:rowView]];
         }];
         if (ndFlags.autoResizeRows)
             [self performSelectorOnce:@selector(resetRowHeights) 
afterDelay:0.0];

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit