kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Playlist View: Remove some bugs in the sizing

CQTexperiment
Christopher Snowhill 2022-01-20 17:02:34 -08:00
parent db867c841c
commit b317bfcdc2
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Base.lproj/MainMenu.xib
View File

@ -34,7 +34,7 @@
<rect key="frame" x="0.0" y="0.0" width="1000" height="378"/> <rect key="frame" x="0.0" y="0.0" width="1000" height="378"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" autosaveName="Playlist" rowHeight="18" rowSizeStyle="automatic" headerView="1517" viewBased="YES" id="207" customClass="PlaylistView"> <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" autosaveName="Playlist" rowHeight="18" headerView="1517" viewBased="YES" id="207" customClass="PlaylistView">
<rect key="frame" x="0.0" y="0.0" width="1000" height="361"/> <rect key="frame" x="0.0" y="0.0" width="1000" height="361"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="6"/> <size key="intercellSpacing" width="3" height="6"/>
@ -210,7 +210,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews> <prototypeCellViews>
<tableCellView id="gpC-Oe-Rog"> <tableCellView id="gpC-Oe-Rog">
<rect key="frame" x="234.5" y="3" width="149" height="18"/> <rect key="frame" x="235" y="3" width="149" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1WK-qN-Mgj"> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1WK-qN-Mgj">
@ -289,7 +289,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews> <prototypeCellViews>
<tableCellView id="hhB-nv-e78"> <tableCellView id="hhB-nv-e78">
<rect key="frame" x="540.5" y="3" width="95" height="18"/> <rect key="frame" x="541" y="3" width="95" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tHy-sM-HDB"> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tHy-sM-HDB">
@ -366,7 +366,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews> <prototypeCellViews>
<tableCellView id="rRl-p9-Awr"> <tableCellView id="rRl-p9-Awr">
<rect key="frame" x="735.5" y="3" width="144" height="18"/> <rect key="frame" x="736" y="3" width="144" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yW6-2w-6mN"> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yW6-2w-6mN">
@ -402,7 +402,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews> <prototypeCellViews>
<tableCellView id="hgh-VE-5kl"> <tableCellView id="hgh-VE-5kl">
<rect key="frame" x="882.5" y="3" width="38" height="18"/> <rect key="frame" x="883" y="3" width="38" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yEY-MI-d3o"> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yEY-MI-d3o">
@ -547,12 +547,12 @@
</tableColumn> </tableColumn>
</tableColumns> </tableColumns>
<connections> <connections>
<binding destination="1689" name="fontSize" keyPath="values.fontSize" id="IWY-vf-qDN"/>
<binding destination="1689" name="rowHeight" keyPath="values.fontSize" id="1927"> <binding destination="1689" name="rowHeight" keyPath="values.fontSize" id="1927">
<dictionary key="options"> <dictionary key="options">
<string key="NSValueTransformerName">FontSizetoLineHeightTransformer</string> <string key="NSValueTransformerName">FontSizetoLineHeightTransformer</string>
</dictionary> </dictionary>
</binding> </binding>
<binding destination="1689" name="fontSize" keyPath="values.fontSize" id="IWY-vf-qDN"/>
<outlet property="dataSource" destination="218" id="843"/> <outlet property="dataSource" destination="218" id="843"/>
<outlet property="delegate" destination="218" id="845"/> <outlet property="delegate" destination="218" id="845"/>
<outlet property="menu" destination="1063" id="1065"/> <outlet property="menu" destination="1063" id="1065"/>

22
Playlist/PlaylistController.m
View File

@ -303,9 +303,15 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
NSView * view = [tableView makeViewWithIdentifier:cellIdentifier owner:nil]; NSView * view = [tableView makeViewWithIdentifier:cellIdentifier owner:nil];
if (view) { if (view) {
NSTableCellView * cellView = (NSTableCellView *) view; NSTableCellView * cellView = (NSTableCellView *) view;
if (cellView.textField) { NSRect frameRect = cellView.frame;
NSFont * font = [NSFont systemFontOfSize:fontSize]; frameRect.origin.y = 1;
frameRect.size.height = tableView.rowHeight;
cellView.frame = frameRect;
if (cellView.textField) {
NSFont * font = [NSFont systemFontOfSize:fontSize];
cellView.textField.font = font; cellView.textField.font = font;
cellView.textField.stringValue = cellText; cellView.textField.stringValue = cellText;
cellView.textField.alignment = cellTextAlignment; cellView.textField.alignment = cellTextAlignment;
@ -314,11 +320,22 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
cellView.textField.toolTip = cellText; cellView.textField.toolTip = cellText;
else else
cellView.textField.toolTip = [pe statusMessage]; cellView.textField.toolTip = [pe statusMessage];
NSRect cellFrameRect = cellView.textField.frame;
cellFrameRect.origin.y = 1;
cellFrameRect.size.height = frameRect.size.height;
cellView.textField.frame = cellFrameRect;
} }
if (cellView.imageView) { if (cellView.imageView) {
cellView.imageView.image = cellImage; cellView.imageView.image = cellImage;
cellView.imageView.toolTip = [pe statusMessage]; cellView.imageView.toolTip = [pe statusMessage];
NSRect cellFrameRect = cellView.imageView.frame;
cellFrameRect.size.height = frameRect.size.height;
cellFrameRect.origin.y = 1;
cellView.imageView.frame = cellFrameRect;
} }
cellView.rowSizeStyle = NSTableViewRowSizeStyleCustom; cellView.rowSizeStyle = NSTableViewRowSizeStyleCustom;
} }
@ -327,6 +344,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
- (void)updateRowSize { - (void)updateRowSize {
[self.tableView reloadData]; [self.tableView reloadData];
if (currentEntry != nil) [self.tableView scrollRowToVisible:currentEntry.index];
} }
- (void)tableView:(NSTableView *)tableView didClickTableColumn:(NSTableColumn *)tableColumn { - (void)tableView:(NSTableView *)tableView didClickTableColumn:(NSTableColumn *)tableColumn {

2
Transformers/FontSizetoLineHeightTransformer.m
View File

@ -18,7 +18,7 @@
- (id)transformedValue:(id)value { - (id)transformedValue:(id)value {
NSFont *font = [NSFont systemFontOfSize:[(NSNumber *)value floatValue]]; NSFont *font = [NSFont systemFontOfSize:[(NSNumber *)value floatValue]];
NSLayoutManager *layoutManager = [[NSLayoutManager alloc] init]; NSLayoutManager *layoutManager = [[NSLayoutManager alloc] init];
float fRowSize = [layoutManager defaultLineHeightForFont:font] * 1.2; float fRowSize = [layoutManager defaultLineHeightForFont:font];
return [NSNumber numberWithFloat: fRowSize]; return [NSNumber numberWithFloat: fRowSize];
} }