Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
5d236974 by Claudio Cambra at 2024-05-30T04:05:58+00:00
macosx: Fix Season/Episode string for media items that are TV shows
Signed-off-by: Claudio Cambra <[email protected]>
- - - - -
9b3a9076 by Claudio Cambra at 2024-05-30T04:05:58+00:00
macosx: Improve visiility of secondary detail string in media item
supplementary view
Signed-off-by: Claudio Cambra <[email protected]>
- - - - -
2 changed files:
-
modules/gui/macosx/library/VLCLibraryCollectionViewMediaItemSupplementaryDetailView.m
- modules/gui/macosx/library/VLCLibraryDataTypes.m
Changes:
=====================================
modules/gui/macosx/library/VLCLibraryCollectionViewMediaItemSupplementaryDetailView.m
=====================================
@@ -103,8 +103,12 @@ NSCollectionViewSupplementaryElementKind const
VLCLibraryCollectionViewMediaItem
self.mediaItemPrimaryDetailButton.enabled = primaryActionableDetail;
self.mediaItemSecondaryDetailButton.enabled = secondaryActionableDetail;
if (@available(macOS 10.14, *)) {
- self.mediaItemPrimaryDetailButton.contentTintColor =
primaryActionableDetail ? NSColor.VLCAccentColor : NSColor.secondaryLabelColor;
- self.mediaItemSecondaryDetailButton.contentTintColor =
secondaryActionableDetail ? NSColor.secondaryLabelColor :
NSColor.tertiaryLabelColor;
+ NSColor * const primaryDetailButtonColor =
+ primaryActionableDetail ? NSColor.VLCAccentColor :
NSColor.labelColor;
+ NSColor * const secondaryDetailButtonColor =
+ secondaryActionableDetail ? NSColor.VLCAccentColor :
NSColor.labelColor;
+ self.mediaItemPrimaryDetailButton.contentTintColor =
primaryDetailButtonColor;
+ self.mediaItemSecondaryDetailButton.contentTintColor =
secondaryDetailButtonColor;
}
self.mediaItemPrimaryDetailButton.action = @selector(primaryDetailAction:);
self.mediaItemSecondaryDetailButton.action =
@selector(secondaryDetailAction:);
=====================================
modules/gui/macosx/library/VLCLibraryDataTypes.m
=====================================
@@ -1049,9 +1049,9 @@ static NSString
*genreArrayDisplayString(NSArray<VLCMediaLibraryGenre *> * const
case VLC_ML_MEDIA_SUBTYPE_SHOW_EPISODE:
{
VLCInputItem * const inputItem = self.inputItem;
+ VLCMediaLibraryShowEpisode * const episodeInfo = self.showEpisode;
return [NSString stringWithFormat:_NS("Season %u, Episode %u"),
- inputItem.season,
- inputItem.episode];
+ episodeInfo.seasonNumber, episodeInfo.episodeNumber];
}
case VLC_ML_MEDIA_SUBTYPE_ALBUMTRACK:
{
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/4473bb37f965b66519b02d2cfa87ddb04496d4ba...9b3a9076afc7e77c7bc3b9d1babe36de210cfb25
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/4473bb37f965b66519b02d2cfa87ddb04496d4ba...9b3a9076afc7e77c7bc3b9d1babe36de210cfb25
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
