videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-28 23:09:59 +02:00
Code Releases Activity

macosx: Move pricate row height declarations in VLCLibraryWindow to VLCLibraryUIUnits

Browse Source 
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
This commit is contained in:
Claudio Cambra 2022-12-28 02:56:55 +01:00 committed by Jean-Baptiste Kempf
parent 32db73190a
commit accd9c3175
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gui/macosx/library/VLCLibraryUIUnits.h
View File

@ -32,6 +32,10 @@ NS_ASSUME_NONNULL_BEGIN
+ (CGFloat)scrollBarSmallSideSize;
+ (CGFloat)largeTableViewRowHeight;
+ (CGFloat)mediumTableViewRowHeight;
+ (CGFloat)smallTableViewRowHeight;
@end
NS_ASSUME_NONNULL_END

15
modules/gui/macosx/library/VLCLibraryUIUnits.m
View File

@ -44,4 +44,19 @@
return 16;
}
+ (CGFloat)largeTableViewRowHeight
{
return 100;
}
+ (CGFloat)mediumTableViewRowHeight
{
return 50;
}
+ (CGFloat)smallTableViewRowHeight
{
return 25;
}
@end

16
modules/gui/macosx/library/VLCLibraryWindow.m
View File

@ -65,10 +65,6 @@
const CGFloat VLCLibraryWindowMinimalWidth = 604.;
const CGFloat VLCLibraryWindowMinimalHeight = 307.;
const CGFloat VLCLibraryWindowLargePlaylistRowHeight = 60.;
const CGFloat VLCLibraryWindowSmallPlaylistRowHeight = 45.;
const CGFloat VLCLibraryWindowSmallRowHeight = 24.;
const CGFloat VLCLibraryWindowLargeRowHeight = 50.;
const CGFloat VLCLibraryWindowDefaultPlaylistWidth = 340.;
const CGFloat VLCLibraryWindowMinimalPlaylistWidth = 170.;
const NSUserInterfaceItemIdentifier VLCLibraryWindowIdentifier = @"VLCLibraryWindow";
@ -251,8 +247,8 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
_libraryVideoTableViewDataSource.libraryModel = mainInstance.libraryController.libraryModel;
_libraryVideoTableViewDataSource.groupsTableView = _videoLibraryGroupsTableView;
_libraryVideoTableViewDataSource.groupSelectionTableView = _videoLibraryGroupSelectionTableView;
_videoLibraryGroupsTableView.rowHeight = VLCLibraryWindowLargeRowHeight;
_videoLibraryGroupSelectionTableView.rowHeight = VLCLibraryWindowLargeRowHeight;
_videoLibraryGroupsTableView.rowHeight = [VLCLibraryUIUnits mediumTableViewRowHeight];
_videoLibraryGroupSelectionTableView.rowHeight = [VLCLibraryUIUnits mediumTableViewRowHeight];
[_libraryVideoTableViewDataSource setup];
_libraryVideoCollectionViewsStackViewController = [[VLCLibraryVideoCollectionViewsStackViewController alloc] init];
@ -260,7 +256,7 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
_libraryVideoCollectionViewsStackViewController.collectionsStackView = _videoLibraryCollectionViewsStackView;
_libraryAudioViewController = [[VLCLibraryAudioViewController alloc] initWithLibraryWindow:self];
_audioCollectionSelectionTableView.rowHeight = VLCLibraryWindowLargeRowHeight;
_audioCollectionSelectionTableView.rowHeight = [VLCLibraryUIUnits mediumTableViewRowHeight];
_audioGroupSelectionTableView.rowHeight = [VLCLibraryAlbumTableCellView defaultHeight];
_mediaSourceDataSource = [[VLCMediaSourceBaseDataSource alloc] init];
@ -269,7 +265,7 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
_mediaSourceDataSource.homeButton = _mediaSourceHomeButton;
_mediaSourceDataSource.pathControl = _mediaSourcePathControl;
_mediaSourceDataSource.gridVsListSegmentedControl = _gridVsListSegmentedControl;
_mediaSourceTableView.rowHeight = VLCLibraryWindowLargeRowHeight;
_mediaSourceTableView.rowHeight = [VLCLibraryUIUnits mediumTableViewRowHeight];
_mediaSourceDataSource.tableView = _mediaSourceTableView;
[_mediaSourceDataSource setupViews];
@ -428,7 +424,9 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
- (void)updateViewCellDimensionsBasedOnSetting:(NSNotification *)aNotification
{
_playlistTableView.rowHeight = config_GetInt("macosx-large-text") ? VLCLibraryWindowLargePlaylistRowHeight : VLCLibraryWindowSmallPlaylistRowHeight;
_playlistTableView.rowHeight = config_GetInt("macosx-large-text") ?
[VLCLibraryUIUnits largeTableViewRowHeight] :
[VLCLibraryUIUnits mediumTableViewRowHeight];
}
#pragma mark - playmode state display and interaction