cocoaui: fix album art drawing regression in pinned group mode, regression from 654803f (fixes #3263)

Author: Oleksiy-Yakovenko

plugins/cocoaui/Playlist/PlaylistContentView.m

@@ -461,7 +461,7 @@ - (void)drawListView:(NSRect)dirtyRect {
 
         // draw album art
         int grp_next_y = grp_y + grp->height;
-        [self renderAlbumArtForGroup:grp groupIndex:groupIndex isPinnedGroup:(self.pinnedGroupTitleView.group == grp) nextGroupCoord:grp_next_y yPos:grp_y + title_height viewportY:dirtyRect.origin.y clipRegion:dirtyRect];
+        [self renderAlbumArtForGroup:grp groupIndex:groupIndex isPinnedGroup:(self.pinnedGroupTitleView.group == grp) nextGroupCoord:grp_next_y yPos:grp_y + title_height viewportY:self.enclosingScrollView.documentVisibleRect.origin.y clipRegion:dirtyRect];
 
         idx += grp->num_items;
         grp_y += grp->height;

plugins/cocoaui/Playlist/PlaylistViewController.m

@@ -1012,24 +1012,22 @@ - (void)drawAlbumArtForGroup:(PlaylistGroup *)grp
             [lv.contentView drawGroup:grp];
         }];
     }
-    if (!image) {
+    if (image == nil) {
         // FIXME: the problem here is that if the cover is not found (yet) -- it won't draw anything, but the rect is already invalidated, and will come out as background color
         return;
     }
 
     NSRect drawRect;
 
-    int art_x = x + ART_PADDING_HORZ;
-    CGFloat min_y = (pinned ? viewportY+lv.contentView.grouptitle_height : y) + ART_PADDING_VERT;
-    CGFloat max_y = grp_next_y;
-
     NSSize size = image.size;
     NSSize desiredSize = [CoverManager.shared desiredSizeForImageSize:size availableSize:availableSize];
     CGSize drawSize = [self.view convertSizeFromBacking:desiredSize];
 
-    CGFloat ypos = min_y;
-    if (min_y + drawSize.height + ART_PADDING_VERT >= max_y) {
-        ypos = max_y - drawSize.height - ART_PADDING_VERT;
+    CGFloat art_x = x + ART_PADDING_HORZ;
+    CGFloat ypos = (pinned ? viewportY + lv.contentView.grouptitle_height : y) + ART_PADDING_VERT;
+
+    if (pinned && ypos + drawSize.height + ART_PADDING_VERT >= grp_next_y) {
+        ypos = grp_next_y - drawSize.height - ART_PADDING_VERT;
     }
 
     if (size.width < size.height) {